--- a/FileBrowserV2.st Mon Aug 31 09:35:59 2015 +0100
+++ b/FileBrowserV2.st Tue Sep 01 06:43:01 2015 +0100
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
"
COPYRIGHT (c) 2002 by eXept Software AG
All Rights Reserved
@@ -326,6 +328,9 @@
#columnLabel
'The text-cursor''s column number'
+#lineAndColumnLabel
+'The text-cursor''s line and column number'
+
#encodingLabel
'The file''s encoding (Right-click to change)'
@@ -523,7 +528,7 @@
comboList: listOfDeviceDrives
useIndex: false
hidePullDownMenuButton: false
- extent: (Point 53 23)
+ extent: (Point 53 21)
)
(VariableHorizontalPanelSpec
name: 'VariableHorizontalPanel1'
@@ -639,7 +644,7 @@
)
(ViewSpec
name: 'InfoBox'
- layout: (LayoutFrame 0 0 -26 1 0 1 0 1)
+ layout: (LayoutFrame 0 0 -26 1 -16 1 0 1)
level: 0
visibilityChannel: infoBarVisibleHolder
component:
@@ -660,6 +665,7 @@
layout: (LayoutFrame -318 1 2 0.0 -235 1 0 1.0)
activeHelpKey: encodingLabel
level: 0
+ translateLabel: true
labelChannel: fileEncodingHolder
adjust: right
menu: encodingMenu
@@ -669,6 +675,7 @@
layout: (LayoutFrame -235 1 2 0.0 -220 1 20 0.0)
activeHelpKey: encodingLockedLabel
level: 0
+ translateLabel: true
labelChannel: fileEncodingLockImageHolder
adjust: right
menu: encodingMenu
@@ -694,7 +701,7 @@
(ProgressIndicatorSpec
name: 'ProgressIndicator1'
layout: (LayoutFrame 5 0.0 -7 0.5 -5 1.0 7 0.5)
- backgroundColor: (Color 0.0 66.666666666666671 66.666666666666671)
+ backgroundColor: (Color 0.0 66.75 66.75)
isActivityIndicator: true
)
)
@@ -723,24 +730,13 @@
postBuildCallback: postBuildEditModeInfoLabel:
)
(LabelSpec
- label: 'L'
- name: 'LineLabel'
- layout: (LayoutFrame -55 1 1 0.0 -20 1 1 1.0)
- activeHelpKey: lineLabel
+ label: 'L : C'
+ name: 'LineAndColumnLabel'
+ layout: (LayoutFrame -55 1 1 0.0 0 1 1 1.0)
+ activeHelpKey: lineAndColumnLabel
level: -1
- translateLabel: true
- labelChannel: cursorLineLabelHolder
- adjust: right
- )
- (LabelSpec
- label: 'C'
- name: 'ColLabel'
- layout: (LayoutFrame -20 1 1 0.0 0 1 1 1.0)
- activeHelpKey: columnLabel
- level: -1
- translateLabel: true
- labelChannel: cursorColLabelHolder
- adjust: right
+ labelChannel: cursorLineAndColumnLabelHolder
+ adjust: left
)
)
@@ -754,7 +750,7 @@
level: 0
borderWidth: 1
visibilityChannel: previewVisibleHolder
- backgroundColor: (Color 86.999313344014652 86.999313344014652 86.999313344014652)
+ backgroundColor: (Color 87.0 87.0 87.0)
translateLabel: true
)
(ArbitraryComponentSpec
@@ -1886,6 +1882,16 @@
]
!
+cursorLineAndColumnLabelHolder
+ ^ self
+ aspectFor:#cursorLineAndColumnLabelHolder
+ ifAbsent:[
+ self
+ applicationNamed:#FileApplicationNoteBook
+ ifPresentDo:[:appl | appl cursorLineAndColumnLabelHolder].
+ ]
+!
+
cursorLineLabelHolder
^ self
aspectFor:#cursorLineLabelHolder
@@ -2331,7 +2337,7 @@
viewsName := eventView name.
anEvent isButtonMultiPressEvent ifTrue:[
- viewsName = 'LineLabel' ifTrue:[
+ (viewsName = 'LineLabel' or:[viewsName = 'LineAndColumnLabel']) ifTrue:[
editor := subApp perform:#editView ifNotUnderstood:nil.
editor notNil ifTrue:[
editor gotoLine
@@ -2589,11 +2595,11 @@
!FileBrowserV2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.231 2015-02-13 10:54:10 cg Exp $'
+ ^ '$Header$'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.231 2015-02-13 10:54:10 cg Exp $'
+ ^ '$Header$'
! !