TerminalApplication.st
branchjv
changeset 15566 184cea584be5
parent 13289 cc75e3cd0362
parent 14803 49e18f3d2f26
child 15950 23be8cf85415
--- a/TerminalApplication.st	Sun Jan 12 23:30:25 2014 +0000
+++ b/TerminalApplication.st	Wed Apr 01 10:38:01 2015 +0100
@@ -61,36 +61,36 @@
     <resource: #canvas>
 
     ^ 
-     #(#FullSpec
-        #name: #windowSpec
-        #window: 
-       #(#WindowSpec
-          #label: 'Terminal'
-          #name: 'Terminal'
-          #min: #(#Point 10 10)
-          #bounds: #(#Rectangle 13 23 445 264)
-          #menu: #mainMenu
-        )
-        #component: 
-       #(#SpecCollection
-          #collection: #(
-           #(#NoteBookViewSpec
-              #name: 'NoteBook1'
-              #layout: #(#LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-              #model: #selectedWorkspaceIndexHolder
-              #menu: #tabList
-              #useIndex: true
-              #accessTabMenuAction: #tabMenuAt:
-              #canvas: #workspaceHolder
-              #canvasInset: 0
-              #canvasFrameLevel: 0
-              #keepCanvasAlive: true
-              #tabLevel: 1
-            )
+    #(FullSpec
+       name: windowSpec
+       window: 
+      (WindowSpec
+         label: 'Terminal'
+         name: 'Terminal'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 432 241)
+         menu: mainMenu
+       )
+       component: 
+      (SpecCollection
+         collection: (
+          (NoteBookViewSpec
+             name: 'NoteBook1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             model: selectedWorkspaceIndexHolder
+             menu: tabList
+             useIndex: true
+             accessTabMenuAction: tabMenuAt:
+             destroyTabAction: removeWorkspace:
+             canvas: workspaceHolder
+             canvasInset: 0
+             keepCanvasAlive: true
+             tabLevel: 1
            )
-         
-        )
-      )
+          )
+        
+       )
+     )
 ! !
 
 !TerminalApplication class methodsFor:'menu specs'!
@@ -154,6 +154,33 @@
             )
           )
          (MenuItem
+            label: 'Buffers'
+            nameKey: Buffer
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Add Buffer'
+                  itemValue: addWorkspace
+                )
+               (MenuItem
+                  label: 'Rename...'
+                  itemValue: renameWorkspace
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: canRemoveWorkspace
+                  label: 'Remove Buffer'
+                  itemValue: removeWorkspace
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
             label: 'View'
             submenu: 
            (Menu
@@ -187,33 +214,6 @@
             )
           )
          (MenuItem
-            label: 'Buffers'
-            nameKey: Buffer
-            submenu: 
-           (Menu
-              (
-               (MenuItem
-                  label: 'Add Buffer'
-                  itemValue: addWorkspace
-                )
-               (MenuItem
-                  label: 'Rename...'
-                  itemValue: renameWorkspace
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: canRemoveWorkspace
-                  label: 'Remove Buffer'
-                  itemValue: removeWorkspace
-                )
-               )
-              nil
-              nil
-            )
-          )
-         (MenuItem
             label: 'Edit'
             submenu: 
            (Menu
@@ -301,8 +301,6 @@
         nil
         nil
       )
-
-    "Modified: / 30-07-2013 / 11:01:18 / cg"
 !
 
 tabMenu
@@ -383,7 +381,10 @@
 !TerminalApplication methodsFor:'menu-actions'!
 
 addWorkspace
-    self addWindow:(self createWorkspace) named:'Terminal%1'
+    self 
+        addWindow:(self createWorkspace) 
+        named:'Terminal%1'
+        "/ tabIcon:(ToolbarIconLibrary console13x13Icon) 
 !
 
 createWorkspace
@@ -392,8 +393,9 @@
 "/    JV@2011-11-30: XTermView disabled as recent changes in
 "/    #startShellInSelectedWindow leads to infinite loop.
 "/    further investigation needed.        
-
-    (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
+    "/ sorry jan: XtermView seems to be not ok (masterView:) and also not working
+    "/ on all systems (mac). make this a configurable option
+    false "(OperatingSystem isUNIXlike and:[XTermView notNil])" ifTrue:[
         scr := XTermView new.
         scr workingDirectory: initialDirectory.
     ] ifFalse:[
@@ -594,19 +596,10 @@
 !TerminalApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.19 2013-07-30 09:02:01 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.23 2014-10-25 12:51:00 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.19 2013-07-30 09:02:01 cg Exp $'
-!
-
-version_HG
-
-    ^ '$Changeset: <not expanded> $'
-!
-
-version_SVN
-    ^ '$Id: TerminalApplication.st 7963 2012-04-03 12:32:03Z vranyj1 $'
+    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.23 2014-10-25 12:51:00 cg Exp $'
 ! !