Mercurial Mercurial > hg > stx-libbasic3 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jv
authorMerge Script
Thu, 29 Oct 2015 06:54:10 +0100
branchjv
changeset 3920 5bbc53c2e67d
parent 3916 abd31b1be82b (current diff)
parent 3919 1373d06bbd50 (diff)
child 3921 243f926d6101
child 3923 ed0c164aaf68
Merge
CVSSourceCodeManager.st file | annotate | diff | comparison | revisions
SourceCodeManagerUtilities.st file | annotate | diff | comparison | revisions
stx_libbasic3.st file | annotate | diff | comparison | revisions 
--- a/CVSSourceCodeManager.st	Fri Oct 16 07:02:07 2015 +0200
+++ b/CVSSourceCodeManager.st	Thu Oct 29 06:54:10 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1995 by Claus Gittinger
               All Rights Reserved
@@ -197,6 +199,8 @@
 !
 
 exeptsPrivateSTXRepositoryModuleRoot
+    "only valid within exept"
+    
     ^ ':pserver:',(OperatingSystem getLoginName),'@cvs.bh.exept.de:/cvs/stx'.
 !
 
@@ -4697,17 +4701,17 @@
             "/ The repair code will be removed at some time in the future...
 
             "/ temporary fix Felix' bad string translation:
-            (aString startsWith:'§Header:') ifTrue:[
-                (aString endsWith:'Exp §') ifTrue:[
+            (aString startsWith:'§Header:') ifTrue:[
+                (aString endsWith:'Exp §') ifTrue:[
                     fixedString := '$' , (aString copyFrom:3 to:(aString size - 2)) , '$'.
 
                     aClass isNil ifTrue:[
                         autoFixHolder value ifFalse:[
-                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
+                            Dialog information:'Attention: the CVS version string is corrupted (§-bug). Please fix it manually'.
                         ]
                     ] ifFalse:[
                         (autoFixHolder value 
-                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
+                            or:[ Dialog confirm:('Attention: the CVS version string is corrupted in "%1" (§-bug). Fix it?' withCRs bindWith:aClass name) ]
                         ) ifTrue:[
                             self updateVersionMethodOf:aClass for:fixedString.
                         ].
@@ -4715,7 +4719,7 @@
                 ].
             ].
 
-            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
+            "/ temporary fix Jan's bad Umlaut-removal (which results in Felix's bad § being removed):
             (aString startsWith:'Header: ') ifTrue:[
                 (aString endsWith:'Exp ') ifTrue:[
                     fixedString := '$' , aString , '$'.
--- a/SourceCodeManagerUtilities.st	Fri Oct 16 07:02:07 2015 +0200
+++ b/SourceCodeManagerUtilities.st	Thu Oct 29 06:54:10 2015 +0100
@@ -2490,7 +2490,7 @@
         "/ defaults, if nothing at all is known
         "/
         (module := LastModule) isNil ifTrue:[
-            module := (OperatingSystem getLoginName).
+            module := (UserPreferences current usersModuleName "OperatingSystem getLoginName").
         ].
         (directory := LastPackage) isNil ifTrue:[
             directory := 'private'.
--- a/stx_libbasic3.st	Fri Oct 16 07:02:07 2015 +0200
+++ b/stx_libbasic3.st	Thu Oct 29 06:54:10 2015 +0100
@@ -239,13 +239,6 @@
 
 !stx_libbasic3 class methodsFor:'description - project information'!
 
-applicationIconFileName
-    "Return the name (without suffix) of an icon-file (the app's icon); will be included in the rc-resource file"
-
-    ^ nil
-    "/ ^ self applicationName
-!
-
 companyName
     "Return a companyname which will appear in <lib>.rc"
hg/stx-libbasic3