Merge jv
authorMerge Script
Sat, 16 Apr 2016 06:47:45 +0200
branchjv
changeset 7296 3e1f431163d7
parent 7293 582b9de4067d (current diff)
parent 7295 439848183f7c (diff)
child 7297 8061a9b76953
Merge
SimpleView.st
--- a/SimpleView.st	Fri Apr 15 06:51:07 2016 +0200
+++ b/SimpleView.st	Sat Apr 16 06:47:45 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -1177,20 +1179,20 @@
     |iconLibraryClass |
 
     DefaultStyle isNil ifTrue:[
-	self setDefaultStyle
+        self setDefaultStyle
     ].
 
     StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
     StyleSheet fileReadFailed ifTrue:[
-	('SimpleView [warning]: ***** no styleSheet for ' , DefaultStyle , '-style.') errorPrintCR.
-	DefaultStyle ~~ #normal ifTrue:[
-	    DefaultStyle := #normal.
-	    StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
-
-	    StyleSheet fileReadFailed ifTrue:[
-		'SimpleView [warning]: not even a styleSheet for normal-style (using ugly defaults).' errorPrintCR.
-	    ]
-	]
+        ('SimpleView [warning]: ***** no styleSheet for ' , DefaultStyle , '-style.') errorPrintCR.
+        DefaultStyle ~~ #normal ifTrue:[
+            DefaultStyle := #normal.
+            StyleSheet := ViewStyle fromFile:(DefaultStyle , '.style').
+
+            StyleSheet fileReadFailed ifTrue:[
+                'SimpleView [warning]: not even a styleSheet for normal-style (using ugly defaults).' errorPrintCR.
+            ]
+        ]
     ].
 
     iconLibraryClass := StyleSheet at:#ToolbarIconLibrary.