Mercurial Mercurial > hg > stx-libtool / 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.
- WorkspaceApplication jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 11 May 2012 17:35:43 +0100
branchjv
changeset 12244 d47ccc29d519
parent 12243 bf110cbcc7d3
child 12245 5e2d98932498
- WorkspaceApplication added: #isSQLWorkspaceSelected #menuSQLConnect comment/format in: #menuAddBookmarkTo: changed: #addSQLWorkspace #fileMenu #workspaceSelectionChanged - MultiViewToolApplication added: #selectedWorkspaceApplication changed: #mainMenu #windowSpec - Tools::CodeView2 added: #defaultFileNameForSave #delegate: - extensions ...
MultiViewToolApplication.st file | annotate | diff | comparison | revisions
Tools__CodeView2.st file | annotate | diff | comparison | revisions
WorkspaceApplication.st file | annotate | diff | comparison | revisions
libtool.rc file | annotate | diff | comparison | revisions 
--- a/MultiViewToolApplication.st	Fri May 11 00:18:29 2012 +0100
+++ b/MultiViewToolApplication.st	Fri May 11 17:35:43 2012 +0100
@@ -120,7 +120,7 @@
           label: 'Workspace'
           name: 'Workspace'
           min: (Point 10 10)
-          bounds: (Rectangle 0 0 432 241)
+          bounds: (Rectangle 0 0 640 480)
           menu: mainMenu
         )
         component: 
@@ -199,6 +199,8 @@
          
         )
       )
+
+    "Modified: / 11-05-2012 / 11:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !MultiViewToolApplication class methodsFor:'menu specs'!
@@ -571,6 +573,22 @@
     ^ workspaces at:wsIndex
 !
 
+selectedWorkspaceApplication
+    "Return an aoplication of selected workspace or nil,
+     is currently selected workspace is not an embedded
+     ApplicationModel"
+
+    | ws |
+    ws := self selectedWorkspace.
+    ^ws isApplicationSubView ifTrue:[
+        ws application
+    ] ifFalse:[
+        nil
+    ]
+
+    "Created: / 11-05-2012 / 09:38:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 tabMenuAt:index
     <resource: #programMenu>
 
@@ -1361,5 +1379,5 @@
 !
 
 version_SVN
-    ^ '$Id: MultiViewToolApplication.st 7990 2012-05-05 22:06:53Z vranyj1 $'
+    ^ '$Id: MultiViewToolApplication.st 7995 2012-05-11 16:35:43Z vranyj1 $'
 ! !
--- a/Tools__CodeView2.st	Fri May 11 00:18:29 2012 +0100
+++ b/Tools__CodeView2.st	Fri May 11 17:35:43 2012 +0100
@@ -481,6 +481,14 @@
     "Modified: / 02-03-2012 / 19:53:19 / cg"
 ! !
 
+!CodeView2 methodsFor:'* As yet uncategorized *'!
+
+defaultFileNameForSave
+    self halt:'please define defaultFileNameForSave here'.
+
+    "Created: / 11-05-2012 / 15:38:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !CodeView2 methodsFor:'accessing'!
 
 acceptAction:aBlock
@@ -572,6 +580,15 @@
     "Created: / 21-02-2012 / 14:20:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+delegate: anObject
+
+    super delegate: anObject.
+    self textView delegate: anObject.
+    self gutterView delegate: anObject.
+
+    "Created: / 11-05-2012 / 10:29:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 diffMode
     ^ diffMode
 !
@@ -3402,7 +3419,7 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Id: Tools__CodeView2.st 7993 2012-05-10 23:18:29Z vranyj1 $'
+    ^ '$Id: Tools__CodeView2.st 7995 2012-05-11 16:35:43Z vranyj1 $'
 !
 
 version_CVS
@@ -3410,7 +3427,7 @@
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st 7993 2012-05-10 23:18:29Z vranyj1 $'
+    ^ '$Id: Tools__CodeView2.st 7995 2012-05-11 16:35:43Z vranyj1 $'
 ! !
 
 CodeView2 initialize!
--- a/WorkspaceApplication.st	Fri May 11 00:18:29 2012 +0100
+++ b/WorkspaceApplication.st	Fri May 11 17:35:43 2012 +0100
@@ -1119,6 +1119,7 @@
     "Do not manually edit this!! If it is corrupted,
      the MenuEditor may not be able to read the specification."
 
+
     "
      MenuEditor new openOnClass:WorkspaceApplication andSelector:#fileMenu
      (Menu new fromLiteralArrayEncoding:(WorkspaceApplication fileMenu)) startUp
@@ -1130,6 +1131,16 @@
      #(Menu
         (
          (MenuItem
+            label: 'Connect...'
+            itemValue: menuSQLConnect
+            translateLabel: true
+            isVisible: isSQLWorkspaceSelected
+          )
+         (MenuItem
+            label: '-'
+            isVisible: isSQLWorkspaceSelected
+          )
+         (MenuItem
             label: 'New Workspace'
             itemValue: newWorkspace
             translateLabel: true
@@ -1158,7 +1169,7 @@
             label: '-'
           )
          (MenuItem
-            label: 'Load File...'
+            label: 'Open File...'
             itemValue: menuLoad
             translateLabel: true
             shortcutKey: Ctrlo
@@ -2172,6 +2183,17 @@
     "Created: / 10-05-2012 / 18:49:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+isSQLWorkspaceSelected
+
+    ^self aspectAt:#isSQLWorkspaceSelected ifAbsentPut:[
+        BlockValue
+            with:[:ignored|self selectedWorkspaceApplication isKindOf: (Smalltalk at:#'SQL::WorkspacePage')]
+            argument: self selectedWorkspaceIndexHolder
+    ]
+
+    "Created: / 11-05-2012 / 09:41:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 isWebBrowserAvailable
 
     ^(Smalltalk at:#WebKitView) notNil
@@ -2634,6 +2656,13 @@
     self openDialogInterface:#manageSnipletsDialogSpec withBindings:bindings
 !
 
+menuSQLConnect
+
+    self selectedWorkspaceApplication menuConnect
+
+    "Created: / 11-05-2012 / 10:00:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 menuSave
     |ws file|
 
@@ -3118,7 +3147,7 @@
 addSQLWorkspace
     |page view |
 
-    page := SQL::WorkspacePage new.
+    page := (Smalltalk at:#'SQL::WorkspacePage') new.
     view := ApplicationSubView new.
     view client:page spec:#windowSpec.
     self addWindow:view named:'SQL Workspace %1'.
@@ -3869,9 +3898,7 @@
     super workspaceSelectionChanged.
 
     selectedWorkspace := self selectedWorkspace.
-    (selectedWorkspace isKindOf: ApplicationSubView) ifTrue:[
-        selectedWorkspaceApp := selectedWorkspace application.
-    ].
+    selectedWorkspaceApp  := self selectedWorkspaceApplication.
 
     (selectedWorkspace notNil and:[selectedWorkspace isScrollWrapper]) ifTrue:[  
         selectedWorkspace := selectedWorkspace scrolledView
@@ -3911,7 +3938,7 @@
     ]
 
     "Modified: / 26-04-2012 / 13:01:55 / cg"
-    "Modified: / 10-05-2012 / 23:46:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 11-05-2012 / 09:39:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !WorkspaceApplication methodsFor:'user actions'!
@@ -3941,7 +3968,7 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Id: WorkspaceApplication.st 7993 2012-05-10 23:18:29Z vranyj1 $'
+    ^ '$Id: WorkspaceApplication.st 7995 2012-05-11 16:35:43Z vranyj1 $'
 !
 
 version_CVS
@@ -3949,5 +3976,5 @@
 !
 
 version_SVN
-    ^ '$Id: WorkspaceApplication.st 7993 2012-05-10 23:18:29Z vranyj1 $'
+    ^ '$Id: WorkspaceApplication.st 7995 2012-05-11 16:35:43Z vranyj1 $'
 ! !
--- a/libtool.rc	Fri May 11 00:18:29 2012 +0100
+++ b/libtool.rc	Fri May 11 17:35:43 2012 +0100
@@ -25,7 +25,7 @@
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
-      VALUE "ProductDate", "Thu, 10 May 2012 23:04:18 GMT\0"
+      VALUE "ProductDate", "Fri, 11 May 2012 16:25:04 GMT\0"
     END
 
   END
hg/stx-libtool