Merge jv
authorMerge Script
Thu, 19 Nov 2015 06:41:54 +0100
branchjv
changeset 5511 3182e8769c7a
parent 5505 f1873e306ba5 (current diff)
parent 5510 33beff6885d8 (diff)
child 5513 505a03171dd1
Merge
GenericToolbarIconLibrary.st
--- a/EditTextViewCompletionSupport.st	Fri Oct 30 07:00:23 2015 +0100
+++ b/EditTextViewCompletionSupport.st	Thu Nov 19 06:41:54 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "{ Package: 'stx:libwidg' }"
 
 "{ NameSpace: Smalltalk }"
@@ -42,7 +40,7 @@
 !EditTextViewCompletionSupport class methodsFor:'queries'!
 
 isAbstract
-    ^true
+    ^ self == EditTextViewCompletionSupport
 
     "Created: / 26-09-2013 / 16:22:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
--- a/GenericToolbarIconLibrary.st	Fri Oct 30 07:00:23 2015 +0100
+++ b/GenericToolbarIconLibrary.st	Thu Nov 19 06:41:54 2015 +0100
@@ -15636,25 +15636,49 @@
 !GenericToolbarIconLibrary class methodsFor:'image specs-tools-SystemBrowser-classIcons'!
 
 abstractClassIcon
-    "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 abstractClassIcon inspect
-     ImageEditor openOnClass:self andSelector:#abstractClassIcon
-     Icon flushCachedIcons
-    "
-
-    <resource: #image>
-
-    ^Icon
-        constantNamed:'GenericToolbarIconLibrary abstractClassIcon'
+    ^ self abstractClassIcon2
+!
+
+abstractClassIcon1
+    "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 abstractClassIcon1 inspect
+     ImageEditor openOnClass:self andSelector:#abstractClassIcon1
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary abstractClassIcon1'
         ifAbsentPut:[(Depth4Image width:13 height:11) bits:(ByteArray fromPackedString:'@@@@@@@@@@@@EBIA@@@@@BH"H @@@AH"H"H!!@@ABH#L"I@@@H"L@L"H@@BH#@CH"@@ABH#L"I@@@D"H"H"D@@@@"H"H@@@@@EBIA@@@b') colorMapFromArray:#[214 177 82 229 207 148 204 159 42 226 201 136 207 165 55] mask:((ImageMask width:13 height:11) bits:(ByteArray fromPackedString:'@@@O0A? O?@?<C30OO@?<C?0G>@O0@@a'); yourself); yourself]
 !
 
+abstractClassIcon2
+    "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 abstractClassIcon2 inspect
+     ImageEditor openOnClass:self andSelector:#abstractClassIcon2
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary abstractClassIcon2'
+        ifAbsentPut:[(Depth2Image width:13 height:11) bits:(ByteArray fromPackedString:'@@ @H@@*@@@@K @ @B8@@@B. @@@*(@@@+N @@K@8@@@@@@@@@@@@@@@@@@b') colorMapFromArray:#[0 0 0 84 84 84 127 127 255 255 255 255] mask:((ImageMask width:13 height:11) bits:(ByteArray fromPackedString:'@ @G@@\@A0@O @>@G\@X0@@@@@@@@@@a'); yourself); yourself]
+!
+
 announcementClassIcon
     <resource: #image>
     "This resource specification was automatically generated
@@ -16243,6 +16267,26 @@
     ^ self clockPink13x13Icon    
 !
 
+utilityClassIcon
+    "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 utilityClassIcon inspect
+     ImageEditor openOnClass:self andSelector:#utilityClassIcon
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'GenericToolbarIconLibrary utilityClassIcon'
+        ifAbsentPut:[(Depth2Image width:13 height:11) bits:(ByteArray fromPackedString:'@ @ H@K@8@@B0N@ @,C @@K@8@@A0M@@@W=P@@A*P@@@@@@@@@@@@@@@@@@b') colorMapFromArray:#[0 0 0 160 160 255 127 127 255 255 255 255] mask:((ImageMask width:13 height:11) bits:(ByteArray fromPackedString:'DD@X0A#@FL@X0A#@G<@O @@@@@@@@@@a'); yourself); yourself]
+!
+
 visualStartableClassBrowserIcon
     "This resource specification was automatically generated
      by the ImageEditor of ST/X."
--- a/Workspace.st	Fri Oct 30 07:00:23 2015 +0100
+++ b/Workspace.st	Thu Nov 19 06:41:54 2015 +0100
@@ -1891,15 +1891,14 @@
 
     sel := self selectedTextOrSyntaxElement.
     sel notEmptyOrNil ifTrue:[
-	sel := sel asSymbol.
-	self windowGroup withWaitCursorDo:[
-	    SharedPool allSubclassesDo:[:eachPool |
-		(eachPool includesKey:sel) ifTrue:[
-		    (UserPreferences systemBrowserClass)
-			openInClass:eachPool class selector:#initialize
-		].
-	    ].
-	].
+        sel := sel asSymbol.
+        self windowGroup withWaitCursorDo:[
+            SharedPool allSubclassesDo:[:eachPool |
+                (eachPool includesKey:sel) ifTrue:[
+                    eachPool class browse:#initialize
+                ].
+            ].
+        ].
     ].
 
     "Created: / 15-01-2011 / 14:01:39 / cg"