Merge jv
authorMerge Script
Tue, 23 Jun 2015 06:45:08 +0200
branchjv
changeset 15703 e26e51cf32f5
parent 15697 cef5189db556 (current diff)
parent 15702 49a0ffb6f350 (diff)
child 15705 8e342f783ecb
Merge
AbstractLauncherApplication.st
DirectoryContentsBrowser.st
resources/de.rs
--- a/AbstractLauncherApplication.st	Mon Jun 22 06:43:00 2015 +0200
+++ b/AbstractLauncherApplication.st	Tue Jun 23 06:45:08 2015 +0200
@@ -2045,16 +2045,16 @@
 !
 
 startChangeSetBrowser
-    "open a change Set Browser"
-
-    ^ UserPreferences current changesBrowserClass open
+    "open a change Set Browser on the changes in the system"
+
+    ^ UserPreferences current changeSetBrowserClass open
 
     "Created: / 05-11-2001 / 18:04:05 / cg"
     "Modified: / 05-03-2015 / 06:57:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 startChangesBrowser
-    "open a changebrowser - either new or old GUI, depending on userPrefs"
+    "open a changebrowser on the change file - either new or old GUI, depending on userPrefs"
 
     self openApplication:(UserPreferences current changesBrowserClass)
 
@@ -7080,14 +7080,14 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.476 2015-03-05 07:32:59 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.476 2015-03-05 07:32:59 vrany Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: AbstractLauncherApplication.st,v 1.476 2015-03-05 07:32:59 vrany Exp $'
+    ^ '$Id$'
 ! !
 
--- a/DirectoryContentsBrowser.st	Mon Jun 22 06:43:00 2015 +0200
+++ b/DirectoryContentsBrowser.st	Tue Jun 23 06:45:08 2015 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -217,6 +215,7 @@
          labelActionSelector: sortFileListsBy:
          labelActionArgument: 'baseName'
          minWidth: 150
+         height: heightOfFirstRow
          model: baseName
          canSelect: false
          showRowSeparator: false
@@ -230,6 +229,7 @@
          labelActionArgument: 'suffix'
          usePreferredWidth: true
          width: 40
+         height: heightOfFirstRow
          model: suffix
          canSelect: false
          isResizeable: false
@@ -244,6 +244,7 @@
          labelActionArgument: 'inodeNumber'
          usePreferredWidth: true
          width: 75
+         height: heightOfFirstRow
          model: inodeNumber
          canSelect: false
          isResizeable: false
@@ -258,6 +259,7 @@
          labelActionArgument: 'permissions'
          usePreferredWidth: true
          width: 75
+         height: heightOfFirstRow
          model: permissions
          canSelect: false
          isResizeable: false
@@ -272,6 +274,7 @@
          labelActionArgument: 'owner'
          usePreferredWidth: true
          width: 50
+         height: heightOfFirstRow
          model: owner
          canSelect: false
          showRowSeparator: false
@@ -285,6 +288,7 @@
          labelActionArgument: 'group'
          usePreferredWidth: true
          width: 40
+         height: heightOfFirstRow
          model: group
          canSelect: false
          showRowSeparator: false
@@ -296,10 +300,12 @@
          labelButtonType: Button
          labelActionSelector: sortFileListsBy:
          labelActionArgument: 'fileSize'
-         columnAlignment: decimal
+         columnAlignment: right
          usePreferredWidth: true
-         minWidth: 45
+         minWidth: 65
+         height: heightOfFirstRow
          model: sizeString
+         menuFromApplication: false
          canSelect: false
          showRowSeparator: false
          showColSeparator: false
@@ -312,8 +318,10 @@
          labelActionArgument: 'fileSize'
          columnAlignment: right
          usePreferredWidth: true
-         minWidth: 50
+         minWidth: 55
+         height: heightOfFirstRow
          model: sizeInKiloBytesString
+         menuFromApplication: false
          canSelect: false
          showRowSeparator: false
          showColSeparator: false
@@ -326,8 +334,10 @@
          labelActionArgument: 'fileSize'
          columnAlignment: right
          usePreferredWidth: true
-         minWidth: 60
+         minWidth: 65
+         height: heightOfFirstRow
          model: sizeInBytesString
+         menuFromApplication: false
          canSelect: false
          showRowSeparator: false
          showColSeparator: false
@@ -341,6 +351,7 @@
          columnAlignment: right
          usePreferredWidth: true
          width: 140
+         height: heightOfFirstRow
          model: timeAndDate
          writeSelector: date:
          canSelect: false
@@ -354,6 +365,7 @@
          labelActionSelector: sortFileListsBy:
          labelActionArgument: 'fileType'
          width: 250
+         height: heightOfFirstRow
          model: fileInfoString
          canSelect: false
          showRowSeparator: false
@@ -3528,10 +3540,10 @@
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.272 2015-05-07 10:52:27 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.272 2015-05-07 10:52:27 cg Exp $'
+    ^ '$Header$'
 ! !
 
--- a/resources/de.rs	Mon Jun 22 06:43:00 2015 +0200
+++ b/resources/de.rs	Tue Jun 23 06:45:08 2015 +0200
@@ -1,6 +1,6 @@
 #encoding utf8
 
-; $Header: /cvs/stx/stx/libtool/resources/de.rs,v 1.292 2015-03-20 14:55:43 cg Exp $
+; $Header$
 ;
 ; German Workspace (and other tools) resources
 ;
@@ -3359,7 +3359,7 @@
 'Changes Browser / Uncommitted recent changes'   'Änderungsbrowser / offene (nicht eingecheckte) Änderungen'
 'Open Changesbrowser on File'                    'Änderungsbrowser auf Datei öffnen'
 'Open Change Browser on File'                    'Änderungsbrowser auf Datei öffnen'
-'Open Change Set Browser on All Changes'         'Änderungsbrowser auf alle Änderungen öffnen'
+'Open Change Set Browser on all Changes'         'Änderungsbrowser auf alle Änderungen öffnen'
 'no uncommitted changes yet'                     'keine nicht eingecheckten Änderungen'
 
 'Reread Language Resources'     'Sprachspezifische Texte neu lesen'