merged in jv's changes
authorClaus Gittinger <cg@exept.de>
Wed, 05 Feb 2014 20:22:11 +0100
changeset 13887 5d04ca4e1109
parent 13886 8d5e6dbdeea0
child 13888 b74fbed4b0b0
merged in jv's changes
extensions.st
--- a/extensions.st	Wed Feb 05 20:21:37 2014 +0100
+++ b/extensions.st	Wed Feb 05 20:22:11 2014 +0100
@@ -269,6 +269,47 @@
     "Modified: / 12-10-2006 / 16:51:27 / cg"
 ! !
 
+!ChangeSet methodsFor:'private'!
+
+flattenOnto: aCollection
+
+    self do:[:change|change flattenOnto: aCollection]
+! !
+
+!ChangeSet methodsFor:'private'!
+
+flattenedChanges
+	| changes |
+	changes := OrderedCollection new.
+	self flattenOnto: changes.
+	^changes
+! !
+
+!ChangeSet methodsFor:'inspecting'!
+
+inspector2TabBrowser
+
+    ^self newInspector2Tab
+	label: 'Changes';
+	priority: 35;
+	"JV@2011-08-06: Cannot do 'UserPreferences current changeSetBrowserClass'
+	 here since ChangeSetBrowser has no #on: and it is not an application model.
+	 Thus, enforce Tools::ChangeSetBrowser2 here..."
+	application: ((Tools::ChangeSetBrowser2 on: self) beOneColumn; yourself)
+
+    "Modified: / 25-07-2011 / 12:22:07 / sr"
+    "Modified: / 06-08-2011 / 21:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 13-09-2011 / 11:55:53 / cg"
+! !
+
+!ChangeSet methodsFor:'inspecting'!
+
+inspector2Tabs
+    ^ #( inspector2TabCommon inspector2TabBrowser )
+
+    "Created: / 05-07-2011 / 13:40:19 / cg"
+! !
+
 !Character methodsFor:'inspecting'!
 
 inspectorExtraAttributes
@@ -824,6 +865,60 @@
 ?? @???@@_??8@O???@GO?38@!!?8_@@O<C8@@>@^@@@@C@@@@@@b') ; yourself); yourself]
 ! !
 
+!GenericToolbarIconLibrary class methodsFor:'image specs-16x16'!
+
+smalllintWarning16x16
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self smalllintWarning16x16 inspect
+     ImageEditor openOnClass:self andSelector:#smalllintWarning16x16
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary smalllintWarning16x16'
+        ifAbsentPut:[(Depth8Image new) width: 16; height: 16; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@@@@@@@@@@@@@@@@@@@@@@@@@@DA@PDA@@@@@@@@@@@@@@DB@0PC@ D@@@@@@@@@@@DBAPXFA TE@P@@@@@@@@@AA0XHA  FA0D@@@@@@@@@@P$JB0,KA 0A
+@PD@@@@@@@DIB 4NCP(IC1@Q@P@@@@@@D!!LT@QPSD!!@UD@D@@@@@@@DVE0DXE <YF!!$O@P@@@@@@@Q,\GPDPFQ(YD@D@@@@@@@D^@Q< HQ$"FRD @P@@@@@A
+H2P%DA$&F"XYD@D@@@@@@R\(JR(+KB4,J2(A@@@@@@@A@PD.J"(*J"(.@@@@@@@@@@@@@PDA@PDA@P@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 255 248 248 240 184 96 239 168 56 239 168 64 240 192 96 255 232 176 239 176 56 255 232 168 240 184 56 255 240 176 255 240 200 239 184 56 255 248 240 255 248 224 239 192 136 224 160 88 239 200 160 255 216 136 240 200 64 255 240 184 255 248 208 255 224 128 255 208 96 255 200 88 255 216 128 80 40 0 191 168 120 207 208 240 176 168 120 128 168 208 80 104 136 224 176 120 239 192 96 208 152 56 128 160 184 176 176 184 95 112 136 239 192 120 176 192 200 79 96 120 207 200 208 207 128 48 255 224 144 240 216 136 176 144 80 224 200 160]; mask:((Depth1Image new) width: 16; height: 16; photometric:(#blackIs0); bitsPerSample:(#[1]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@_@C>@_<A?0G?0_? ?>C?<G?0_?!!?>G?8O?@G<@@@b') ; yourself); yourself]
+! !
+
+!GenericToolbarIconLibrary class methodsFor:'image specs-versions'!
+
+versionMerged24x24
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self versionMerged24x24 inspect
+     ImageEditor openOnClass:self andSelector:#versionMerged24x24
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+	constantNamed:'GenericToolbarIconLibrary class versionMerged24x24'
+	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+@!!LNDADQE!!XVF!!0_H2D$H2@ H18"H!!8AO=SZ6]''\7^C"8.[&9.#*;N?2;_W6>]HXU^''.;.;.<OS4=OS4=?_8>O#;?O;=?>\RTMOM3L3K2<3M3<?Q5=/^8^W)
+9.[1:=T]Q<N:.[&8.K?A/\GA1LSG1<+J5-#$7<8VR*:.,+N6-+&9.[2<0LC@0LC@0<#B4L$ON:J*****+:.+*;N1-[V5-;.;0LB=1+8VN*J\)JF!!)JR#*J"+
+*:6-,[V5-+&9/;@MNIBQ$)JY$)JY''):^(:N#*J"/)+J/-I4LNXNK#H.N!!)JT$)JR%).[&Y.&)*J&*YLTM6&H"H"H"H.N#(:N#9BP$IZV&*JZ&8(UMU5,\8E9
+ V=2^XRH"8.K"8:O#9*V%''4UMT%HV6I1\WE1\W9/^XNC (NH"H.K#G@YM$EAP45_W&11[7E1^GM8\7M: (M3"VLULDMCRDMAP45[V6I"X&I"[F1,X''91_5 K
+LDMQUEEMRDMCPUQTW6!!+]&I,[HE5[D0KLU)ST5M(W5)TTT5MTUEQUE)SW6-SYC4JL65ST5MST5MST5MSS$9NS$9HQD9DRC8JLVI1[FI"X&I WE1ST5M[ZF!!_
+UEQNS30GLFI,\V11\W!!,X&I"Y&I!!W%9^T5MSWS0HLH]:^&93[798[G9/\V1,X&I!!WFA\Y30EMIF,%9RK_G%9\&=/[6=1[&91[GV@]DHDJ9>6+)2P"8"A!!7=?
+_7=?_7=?\7Q.^4@CA"X-I2\''I2</JR$)JR (JB (K"4,J"T@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[28 1 19 26 0 23 36 0 35 57 0 48 55 1 50 58 0 51 61 0 54 57 3 52 56 0 54 63 0 57 64 0 58 63 0 62 67 3 66 66 0 68 69 5 67 70 6 68 70 0 72 71 0 73 57 15 60 65 17 63 72 9 70 79 0 77 70 0 74 72 0 75 61 25 59 81 2 79 74 13 71 74 1 77 76 4 79 70 15 72 66 23 68 78 7 81 75 19 76 81 12 83 61 25 67 75 21 77 78 23 79 91 5 94 114 6 111 122 0 119 124 0 121 130 0 123 118 0 120 110 25 104 119 0 122 119 17 114 120 0 123 125 20 115 129 2 127 135 0 131 137 0 134 139 0 136 125 26 118 138 1 141 137 22 130 142 9 143 138 16 142 139 31 136 142 22 145 145 26 147 147 16 155 154 0 166 159 22 161 128 73 126 148 48 147 186 0 187 155 40 156 187 0 189 196 0 193 188 0 190 188 0 191 156 31 162 189 0 192 180 0 187 157 32 163 198 0 197 164 20 172 191 4 193 200 0 200 182 3 189 156 57 155 193 9 194 202 0 202 203 0 204 196 13 195 152 66 152 194 0 199 205 0 206 164 41 168 206 0 207 197 17 195 195 0 201 207 0 208 188 16 192 196 0 202 198 20 195 207 0 209 196 0 203 197 0 204 167 45 171 199 23 196 198 0 205 208 0 211 192 23 194 200 26 196 189 0 201 199 2 206 201 29 196 203 7 208 202 31 197 192 5 203 200 0 210 173 52 176 206 13 209 201 0 211 195 11 204 199 33 198 214 18 211 204 36 198 201 0 212 208 17 210 202 0 213 197 15 205 190 33 195 203 0 214 184 47 187 210 21 211 202 39 200 208 41 201 211 24 212 200 22 207 202 25 208 214 28 214 204 28 209 198 1 216 207 47 203 207 31 211 200 45 202 185 65 187 208 33 212 198 32 208 209 35 213 210 38 214 212 40 215 213 42 216 207 55 208 202 40 211 193 73 194 214 44 217 205 42 213 216 46 218 213 28 223 206 44 214 208 47 215 220 49 221 214 62 214 221 51 222 192 87 193 210 50 217 206 83 201 215 64 215 211 51 218 224 55 224 213 53 219 217 67 217 227 58 226 218 68 218 215 56 221 218 58 223 213 80 212 220 71 220 219 60 224 229 62 229 220 61 225 231 64 230 223 74 222 201 96 202 222 63 226 224 75 223 225 76 224 218 85 217 224 65 228 226 78 224 224 67 229 218 77 222 228 80 226 229 82 227 226 70 231 230 83 228 223 81 226 211 105 211 225 92 223 233 85 230 226 93 224 224 84 228 231 75 235 227 95 225 234 87 232 219 94 223 230 98 228 228 89 232 217 106 222 234 102 232 225 100 229 226 101 230 228 104 232 213 116 219 229 105 233 231 107 235 224 114 229 199 149 203 242 102 244 216 137 220 205 135 215 237 113 241 234 128 234 238 114 242 223 126 229 226 134 228 236 130 236 225 128 231 229 131 234 240 134 239 233 117 242 230 133 236 239 128 243 236 143 238 238 145 239 238 123 247 243 133 247 238 146 240 215 161 223 241 148 243 250 144 249 235 156 239 225 155 235 237 158 241 229 163 235 249 142 255 242 161 245 247 149 252 238 154 246 246 170 245 249 151 254 249 153 255 238 170 243 230 176 238 245 161 253 247 163 255 236 181 244 245 166 255 243 172 253 245 190 253 243 184 254 246 193 255 238 193 253]; yourself]
+! !
+
 !Image methodsFor:'inspecting'!
 
 inspector2TabImage
@@ -1356,6 +1451,14 @@
     "Modified: / 07-11-2008 / 08:40:35 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!ProgrammingLanguage methodsFor:'displaying'!
+
+displayString
+    ^ self name
+
+    "Created: / 26-10-2013 / 00:52:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !ProgrammingLanguage methodsFor:'accessing'!
 
 toolbox
@@ -1590,6 +1693,17 @@
     "Created: / 19-10-2008 / 08:01:45 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!UserPreferences methodsFor:'accessing-pref''d tools'!
+
+changesBrowserClassName
+
+    ^ self
+	at: #changesBrowserClassName
+	ifAbsent:[self changesBrowserClass name]."/Backward comparibility
+
+    "Created: / 03-04-2012 / 11:02:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !UserPreferences methodsFor:'obsolete'!
 
 codeView2AutoIndent
@@ -1652,6 +1766,94 @@
 
 !UserPreferences methodsFor:'accessing-prefs-browser'!
 
+confirmRefactorings
+    "If set, each refactoring must be confirmed before accepted.
+     A programmer may select which changes to apply and which not
+     and/or alter the change.
+
+     See RefactoryChange>>shouldBeConfirmed
+     "
+
+    ^ self at:#confirmRefactorings ifAbsent:[false].
+
+    "
+     UserPreferences current confirmRefactorings
+     UserPreferences current confirmRefactorings:true
+     UserPreferences current confirmRefactorings:false
+    "
+
+    "Created: / 04-04-2012 / 14:02:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!UserPreferences methodsFor:'accessing-prefs-browser'!
+
+confirmRefactorings:aBoolean
+    "If set, each refactoring must be confirmed before accepted.
+     A programmer may select which changes to apply and which not
+     and/or alter the change.
+
+     See RefactoryChange>>shouldBeConfirmed
+     "
+
+    ^ self at:#confirmRefactorings put:aBoolean
+
+    "
+     UserPreferences current confirmRefactorings
+     UserPreferences current confirmRefactorings:true
+     UserPreferences current confirmRefactorings:false
+    "
+
+    "Created: / 04-04-2012 / 14:02:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!UserPreferences methodsFor:'accessing-pref''d tools'!
+
+fileBrowserClass
+    | class className |
+
+    className := self at: #fileBrowserClassName ifAbsent:[nil].
+    className notNil ifTrue:[
+	class := Smalltalk at: className asSymbol.
+	class notNil ifTrue:[ ^ class ].
+    ].
+
+    "/ Old code
+    self useNewFileBrowser ifTrue:[
+	^ (FileBrowserV2 ? FileBrowser)
+    ].
+    ^ FileBrowser
+
+    "Modified: / 03-04-2012 / 10:59:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!UserPreferences methodsFor:'accessing-pref''d tools'!
+
+fileBrowserClass: aClass
+
+    self at: #fileBrowserClassName put: aClass name.
+
+    "
+	UserPreferences current fileBrowserClass
+	UserPreferences current fileBrowserClass: FileBrowser.
+	UserPreferences current fileBrowserClass: FileBrowserV2.
+    "
+
+    "Created: / 03-04-2012 / 10:57:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!UserPreferences methodsFor:'accessing-pref''d tools'!
+
+fileBrowserClassName
+
+    ^ self
+	at: #fileBrowserClassName
+	ifAbsent:[self fileBrowserClass name]."/Backward comparibility
+
+    "Created: / 03-04-2012 / 11:01:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!UserPreferences methodsFor:'accessing-prefs-browser'!
+
 showBookmarkBar
     "experimental."
 
@@ -2110,6 +2312,13 @@
 !stx_libtool class methodsFor:'documentation'!
 
 extensionsVersion_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.118 2013-10-15 13:14:13 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/extensions.st,v 1.119 2014-02-05 19:22:11 cg Exp $'
 ! !
 
+!stx_libtool class methodsFor:'documentation'!
+
+extensionsVersion_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+