Merge jv
authorMerge Script
Mon, 31 Aug 2015 06:48:02 +0200
branchjv
changeset 5406 17c0dd588915
parent 5403 569378fb6c8e (current diff)
parent 5405 19049627677d (diff)
child 5409 a862f7795ef5
Merge
EditTextView.st
--- a/EditTextView.st	Sun Aug 30 06:37:19 2015 +0200
+++ b/EditTextView.st	Mon Aug 31 06:48:02 2015 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -5694,7 +5692,14 @@
         "/ nope -
         ^ false
     ].
-    self accept.
+    "/ cg: only do this if modified.
+    "/ otherwise, users would have to make sure that the contents is
+    "/ always correct (which they don't). If you change this back,
+    "/ please check the expecco file-save or file-reimport dialog,
+    "/ which has a problem with that behavior.
+    self modified ifTrue:[
+        self accept.
+    ].
     ^ true.
 !
 
--- a/XPToolbarIconLibrary.st	Sun Aug 30 06:37:19 2015 +0200
+++ b/XPToolbarIconLibrary.st	Mon Aug 31 06:48:02 2015 +0200
@@ -194,8 +194,8 @@
 
     ^Icon
         constantNamed:'XPToolbarIconLibrary addTab14x14Icon'
-        ifAbsentPut:[(Depth4Image new) width:14; height:14; bits:(ByteArray fromPackedString:'WX"H"H"H-]#]7]7]7X.M.;.;.;.8#[.;.;.;.H6;.>:;.;"M.;/..;.8#[/.;.:;.H6;;^;..;"M.;/].;.8#[.;;+.;.H6;.;.;.;"M.;.;.;.8.K.;.;.;
-"5.H"H"H"KTb') ; colorMapFromArray:#[0 0 0 17 17 17 34 34 34 51 51 51 68 68 68 85 85 85 102 102 102 119 119 119 136 136 136 153 153 153 170 170 170 187 187 187 204 204 204 221 221 221 238 238 238]; mask:((ImageMask new) width:14; height:14; bits:(ByteArray fromPackedString:'_?/???????????????????????????????=?>0@a') ; yourself); yourself]
+        ifAbsentPut:[(Depth4Image width:14 height:14) bits:(ByteArray fromPackedString:'W]7]7]7]4M;]7]7]6;C].;.;.;.@7[.;.;.; M6;.>:;.8C].;/..;.@7[/.;.:; M6;;^;..8C].;/].;.@7[.;;+.; M6;.;.;.8C^.;.;.;"07X"H"H"K
+,E@@@@@@@@@b') colorMapFromArray:#[0 0 0 17 17 17 34 34 34 51 51 51 68 68 68 85 85 85 102 102 102 119 119 119 136 136 136 153 153 153 170 170 170 187 187 187 204 204 204 221 221 221 238 238 238] mask:((ImageMask width:14 height:14) bits:(ByteArray fromPackedString:'_?O?>??;??/?>??;??/?>??;??/?>??;_?L@@0@a'); yourself); yourself]
 !
 
 addTabEntered14x14Icon