Merge jv
authorMerge Script
Sun, 16 Aug 2015 06:44:39 +0200
branchjv
changeset 15796 20d7185485a4
parent 15794 79633fa7bf15 (current diff)
parent 15795 5f87fdfb8513 (diff)
child 15797 0cd8f9cab4c0
Merge
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Sat Aug 15 06:39:43 2015 +0200
+++ b/AbstractSettingsApplication.st	Sun Aug 16 06:44:39 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2002 by eXept Software AG
 	      All Rights Reserved
@@ -345,7 +347,7 @@
 !
 
 AbstractSettingsApplication subclass:#TerminalViewSettingsAppl
-	instanceVariableNames:'terminalOutputIsUTF8'
+	instanceVariableNames:'terminalOutputIsUTF8 terminalInputIsUTF8'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:AbstractSettingsApplication
@@ -17753,7 +17755,10 @@
     ^ super flyByHelpSpec addPairsFrom:#(
 
 #terminalOutputIsUTF8
-'The shell''s output is UTF8 encoded (as opposed to Ascii/Latin-1).\Enable this on OSX and some modern Linux systems'
+'The shell''s (or command) output is UTF8 encoded (as opposed to Ascii/Latin-1).\Enable this on OSX and some modern Linux systems'
+
+#terminalInputIsUTF8
+'The shell (or command) accepts UTF8 encoded input (as opposed to Ascii/Latin-1).\Enable this on OSX and some modern Linux systems'
 
 )
 ! !
@@ -17783,44 +17788,52 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
-	 label: 'Editor Settings'
-	 name: 'Editor Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 658 543)
-       )
-       component:
+         label: 'Editor Settings'
+         name: 'Editor Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 658 543)
+       )
+       component: 
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Shell / Command Output is UTF8 encoded'
-		   name: 'UserCodeView2'
-		   translateLabel: true
-		   activeHelpKey: terminalOutputIsUTF8
-		   model: terminalOutputIsUTF8
-		   extent: (Point 658 25)
-		 )
-		)
-
-	     )
-	   )
-	  )
-
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component: 
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Shell / Command Output is UTF8 encoded'
+                   name: 'UserCodeView2'
+                   activeHelpKey: terminalOutputIsUTF8
+                   model: terminalOutputIsUTF8
+                   translateLabel: true
+                   extent: (Point 658 25)
+                 )
+                (CheckBoxSpec
+                   label: 'Shell / Command Input is UTF8 encoded'
+                   name: 'CheckBox1'
+                   activeHelpKey: terminalInputIsUTF8
+                   model: terminalInputIsUTF8
+                   translateLabel: true
+                   extent: (Point 658 25)
+                 )
+                )
+              
+             )
+           )
+          )
+        
        )
      )
 ! !
@@ -17841,12 +17854,21 @@
 
 commonAspects
     ^ #(
-	#terminalOutputIsUTF8
+        #terminalOutputIsUTF8
+        #terminalInputIsUTF8
     )
 ! !
 
 !AbstractSettingsApplication::TerminalViewSettingsAppl methodsFor:'aspects'!
 
+terminalInputIsUTF8
+    terminalInputIsUTF8 isNil ifTrue:[
+        terminalInputIsUTF8 := false asValue.
+        terminalInputIsUTF8 onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ terminalInputIsUTF8.
+!
+
 terminalOutputIsUTF8
     terminalOutputIsUTF8 isNil ifTrue:[
 	terminalOutputIsUTF8 := false asValue.