--- a/ViewWithAcceptAndCancelBar.st	Mon May 16 06:49:42 2016 +0200
+++ b/ViewWithAcceptAndCancelBar.st	Tue May 17 07:04:09 2016 +0200
@@ -260,7 +260,7 @@
 !ViewWithAcceptAndCancelBar::AcceptAndCancelBar methodsFor:'initialization'!
 
 initialize
-    |acceptColor cancelColor compareColor|
+    |acceptColor cancelColor compareColor order|
 
     super initialize.
 
@@ -272,6 +272,8 @@
     cancelColor := Color red.
     compareColor := Color yellow.
 
+    order := UserPreferences current acceptCancelBarOrder.
+    
     acceptButton := ButtonWithHelpText new.
     acceptButton origin:0.0 @ 0.0 corner:1.0@0.7.
     acceptButton backgroundColor:acceptColor.
@@ -281,7 +283,11 @@
     self add:acceptButton.
 
     cancelButton := ButtonWithHelpText new.
-    cancelButton origin:0.0 @ 0.7 corner:1.0@0.9.
+    order == #acceptCompareCancel ifTrue:[
+        cancelButton origin:0.0 @ 0.9 corner:1.0@1.0.
+    ] ifFalse:[
+        cancelButton origin:0.0 @ 0.7 corner:1.0@0.9.
+    ].
     cancelButton backgroundColor:cancelColor.
     cancelButton enteredBackgroundColor:cancelColor lightened.
     cancelButton activeBackgroundColor:cancelColor darkened.
@@ -289,7 +295,11 @@
     self add:cancelButton.
 
     compareButton := ButtonWithHelpText new.
-    compareButton origin:0.0 @ 0.9 corner:1.0@1.0.
+    order == #acceptCompareCancel ifTrue:[
+        compareButton origin:0.0 @ 0.7 corner:1.0@0.9.
+    ] ifFalse:[
+        compareButton origin:0.0 @ 0.9 corner:1.0@1.0.
+    ].
     compareButton backgroundColor:compareColor.
     compareButton enteredBackgroundColor:compareColor lightened lightened.
     compareButton activeBackgroundColor:compareColor darkened.