Added text editor window, broke keyboard shortcuts.

This commit is contained in:
Skyler Lehmkuhl 2012-01-08 17:09:33 -05:00
parent 0698bad15c
commit 76b1ad99de
2 changed files with 11 additions and 5 deletions

View File

@ -214,10 +214,12 @@ class MainWindowOSX:
self.toolbox.buttons[3][1].onPress = paintbrush
self.toolbox.buttons[4][0].onPress = pen
self.toolbox.buttons[4][1].onPress = paint_bucket
self.scriptwindow = svlgui.TextView()
self.frame.layout_self( [self.toolbox,0,None,0,0,"nws",""],
[self.timelinebox,self.toolbox._int()+148,0,0,None,"new","hv"],
[self.timelinebox,self.toolbox._int()+148,-500,0,None,"new","hv"],
[self.layerbox,self.toolbox._int(),self.toolbox._int().width+150,0,None,"n","v"],
[self.stage,self.toolbox._int(),0,self.timelinebox._int()+2,0,"nsew", "hv"])
[self.scriptwindow,self.timelinebox._int(),0,0,0,"nse", "hv"],
[self.stage,self.toolbox._int(),self.scriptwindow._int(),self.timelinebox._int()+2,0,"nsew", "hv"] )
self.window.add(self.frame)
# use mainwindowosx, this is just to comment things out

View File

@ -133,7 +133,8 @@ if sys.platform=="linux2":
import GUI # Using PyGUI. Experimental.
from GUI import Window as OSXWindow, Button as OSXButton, Image as OSXImage
from GUI import Frame as OSXFrame, Color as OSXColor, Grid as OSXGrid
from GUI import Column, Row, ScrollableView, TextEditor, Colors, StdCursors, Alerts, FileDialogs
from GUI import Column, Row, ScrollableView, TextEditor, Colors
from GUI import StdCursors, Alerts, FileDialogs, Font
from GUI.StdMenus import basic_menus, file_cmds, print_cmds
from GUI.Files import FileType
from GUI.Geometry import offset_rect, rect_sized
@ -152,7 +153,8 @@ elif sys.platform=="win32":
import GUI # Using PyGUI. Experimental.
from GUI import Window as OSXWindow, Button as OSXButton, Image as OSXImage
from GUI import Frame as OSXFrame, Color as OSXColor, Grid as OSXGrid
from GUI import Column, Row, ScrollableView, TextEditor, Colors, StdCursors, Alerts, FileDialogs
from GUI import Column, Row, ScrollableView, TextEditor, Colors
from GUI import StdCursors, Alerts, FileDialogs, Font
from GUI.StdMenus import basic_menus, file_cmds, print_cmds
from GUI.Files import FileType
from GUI.Geometry import offset_rect, rect_sized
@ -172,7 +174,8 @@ elif sys.platform=="darwin":
import GUI # Using PyGUI. Experimental.
from GUI import Window as OSXWindow, Button as OSXButton, Image as OSXImage
from GUI import Frame as OSXFrame, Color as OSXColor, Grid as OSXGrid
from GUI import Column, Row, ScrollableView, TextEditor, Colors, StdCursors, Alerts, FileDialogs
from GUI import Column, Row, ScrollableView, TextEditor, Colors
from GUI import StdCursors, Alerts, FileDialogs, Font
from GUI.StdMenus import basic_menus, file_cmds, print_cmds
from GUI.Files import FileType
from GUI.Geometry import offset_rect, rect_sized
@ -722,6 +725,7 @@ class TextView(Widget):
self.box.connect("key-press-event",scroll)
elif SYSTEM=="osx":
self.box = GUI.TextEditor(scrolling="hv")
self.box.font = Font("Mono", 12, [])
elif SYSTEM=="html":
self.box = htmlobj("textarea")
def _int(self):