--- a/Tools__WebBrowserPage.st Wed Feb 05 20:09:11 2014 +0100
+++ b/Tools__WebBrowserPage.st Wed Feb 05 20:09:12 2014 +0100
@@ -28,8 +28,8 @@
"{ NameSpace: Tools }"
ApplicationModel subclass:#WebBrowserPage
- instanceVariableNames:'history webKitView urlHolder titleHolder bookmarkHolder
- toolBarVisibleHolder bookmarkBarVisibleHolder'
+ instanceVariableNames:'history webKitView urlHolder titleHolder linkHolder
+ bookmarkHolder toolBarVisibleHolder bookmarkBarVisibleHolder'
classVariableNames:''
poolDictionaries:''
category:'Interface-Browsers-Web'
@@ -428,6 +428,35 @@
"Created: / 08-06-2011 / 12:16:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+linkHolder
+ "return/create the 'linkHolder' value holder (automatically generated)"
+
+ linkHolder isNil ifTrue:[
+ linkHolder := ValueHolder new.
+ linkHolder addDependent:self.
+ ].
+ ^ linkHolder
+!
+
+linkHolder:something
+ "set the 'linkHolder' value holder (automatically generated)"
+
+ |oldValue newValue|
+
+ linkHolder notNil ifTrue:[
+ oldValue := linkHolder value.
+ linkHolder removeDependent:self.
+ ].
+ linkHolder := something.
+ linkHolder notNil ifTrue:[
+ linkHolder addDependent:self.
+ ].
+ newValue := linkHolder value.
+ oldValue ~~ newValue ifTrue:[
+ self update:#value with:newValue from:linkHolder.
+ ].
+!
+
titleHolder
"return/create the 'titleHolder' value holder (automatically generated)"
@@ -531,14 +560,15 @@
webKitView := WebKitView new
url: self urlHolder;
title: self titleHolder;
+ link: self linkHolder;
yourself.
].
^webKitView.
"Created: / 07-06-2011 / 22:50:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 08-06-2011 / 14:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 18-11-2011 / 15:04:27 / cg"
+ "Modified: / 30-05-2012 / 18:28:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!WebBrowserPage methodsFor:'aspects-queries'!
@@ -577,14 +607,17 @@
self updateBookmark.
^ self.
].
- changedObject == titleHolder ifTrue:[
- self updateBookmark.
- ^ self.
- ].
+
changedObject == toolBarVisibleHolder ifTrue:[
self updateToollBarAndBookmarkBarVisibility.
^ self.
].
+
+ changedObject == linkHolder ifTrue:[
+ self updateLink.
+ ^ self.
+ ].
+
changedObject == bookmarkBarVisibleHolder ifTrue:[
self updateToollBarAndBookmarkBarVisibility.
^ self.
@@ -594,7 +627,7 @@
super update:something with:aParameter from:changedObject
- "Modified: / 10-06-2011 / 23:53:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 30-05-2012 / 18:28:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
updateBookmark
@@ -614,6 +647,16 @@
"Modified: / 08-06-2011 / 14:55:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+updateLink
+
+ (masterApplication notNil and:[masterApplication respondsTo: #infoLabelHolder]) ifTrue:[
+ masterApplication infoLabelHolder value: (self linkHolder value ? '')
+
+ ]
+
+ "Created: / 30-05-2012 / 18:28:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
updateToollBarAndBookmarkBarVisibility
|toolBarVisible toolBar bookmarkBarVisible bookmarkBar pageContent topOffset h|
@@ -744,13 +787,14 @@
!WebBrowserPage class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__WebBrowserPage.st,v 1.8 2012-09-09 19:02:51 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__WebBrowserPage.st,v 1.9 2014-02-05 19:09:12 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/Tools__WebBrowserPage.st,v 1.8 2012-09-09 19:02:51 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__WebBrowserPage.st,v 1.9 2014-02-05 19:09:12 cg Exp $'
!
version_SVN
- ^ '§Id§'
+ ^ '$Id: Tools__WebBrowserPage.st,v 1.9 2014-02-05 19:09:12 cg Exp $'
! !
+