[Fxpy-commits] CVS: FXPy/examples demos.xml,1.1,1.2 imageviewer.py,1.4,1.5 textedit.py,1.2,1.3
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxpy-commits] CVS: FXPy/examples demos.xml,1.1,1.2 imageviewer.py,1.4,1.5 textedit.py,1.2,1.3
|
From: Bastian K. <ca...@us...> - 2002-02-11 09:56:06
|
Update of /cvsroot/fxpy/FXPy/examples
In directory usw-pr-cvs1:/tmp/cvs-serv25037
Modified Files:
demos.xml imageviewer.py textedit.py
Log Message:
minor updates to textedit.py
Index: demos.xml
===================================================================
RCS file: /cvsroot/fxpy/FXPy/examples/demos.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** demos.xml 9 Apr 2001 13:33:07 -0000 1.1
--- demos.xml 11 Feb 2002 09:56:01 -0000 1.2
***************
*** 48,51 ****
--- 48,54 ----
This example demonstrates the FXIconList widget.
</demo>
+ <demo file="imagetest.py" title="Image Test">
+ Test for image widgets.
+ </demo>
<demo file="imageviewer.py" title="Image Viewer">
This example provides the model for a full-featured image viewing and
***************
*** 82,84 ****
--- 85,92 ----
This example provides a birds-eye view of many of the FOX widgets.
</demo>
+ <!--
+ <demo file="textedit.py" title="Textedit">
+ A simple text editor.
+ </demo>
+ -->
</demos>
Index: imageviewer.py
===================================================================
RCS file: /cvsroot/fxpy/FXPy/examples/imageviewer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** imageviewer.py 7 Feb 2002 12:35:14 -0000 1.4
--- imageviewer.py 11 Feb 2002 09:56:01 -0000 1.5
***************
*** 263,268 ****
"XPM Images (*.xpm)\n" + \
"PNG Images (*.png)\n" + \
! "JPEG Images (*.jpg)\n" + \
! "TIFF Images (*.tif)\n" + \
"PCX Images (*.pcx)"
open.setPatternList(patterns)
--- 263,270 ----
"XPM Images (*.xpm)\n" + \
"PNG Images (*.png)\n" + \
! "JPG Images (*.jpg)\n" + \
! "TIF Images (*.tif)\n" + \
! "TGA Images (*.tga)\n" + \
! "ICO Images (*.ico)\n" + \
"PCX Images (*.pcx)"
open.setPatternList(patterns)
Index: textedit.py
===================================================================
RCS file: /cvsroot/fxpy/FXPy/examples/textedit.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** textedit.py 20 Apr 2001 16:05:19 -0000 1.2
--- textedit.py 11 Feb 2002 09:56:01 -0000 1.3
***************
*** 43,47 ****
ID_TABCOLUMNS,
ID_WRAPCOLUMNS,
! ID_DELIMETERS,
ID_INSERTTABS,
ID_AUTOINDENT,
--- 43,47 ----
ID_TABCOLUMNS,
ID_WRAPCOLUMNS,
! ID_DELIMITERS,
ID_INSERTTABS,
ID_AUTOINDENT,
***************
*** 156,161 ****
# Application icons
! self.setIcon(bigicon)
! self.setMiniIcon(smallicon)
# Make main window; set myself as the target
--- 156,161 ----
# Application icons
! self.setIcon(self.bigicon)
! self.setMiniIcon(self.smallicon)
# Make main window; set myself as the target
***************
*** 166,169 ****
--- 166,172 ----
self.helpwindow = None
+ # undo list
+ self.undolist = FXUndoList()
+
# Make menu bar
dragshell1 = FXToolbarShell(self, FRAME_RAISED|FRAME_THICK)
***************
*** 185,189 ****
# Info about the editor
FXButton(statusbar, "\tThe FOX Text Editor\tAbout the FOX Text Editor",
! smallicon, self, TextWindow.ID_ABOUT, LAYOUT_FILL_Y|LAYOUT_RIGHT)
# File menu
--- 188,192 ----
# Info about the editor
FXButton(statusbar, "\tThe FOX Text Editor\tAbout the FOX Text Editor",
! self.smallicon, self, TextWindow.ID_ABOUT, LAYOUT_FILL_Y|LAYOUT_RIGHT)
# File menu
***************
*** 283,322 ****
# Toolbar buttons: File manipulation
! FXButton(toolbar, "New\tNew\tCreate new document.", newicon, self, self.ID_NEW,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Open\tOpen\tOpen document file.", openicon, self, self.ID_OPEN,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Save\tSave\tSave document.", saveicon, self, self.ID_SAVE,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Save As\tSave As\tSave document to another file.", saveasicon,
self, self.ID_SAVEAS, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Toolbar buttons: Print
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Print\tPrint\tPrint document.", printicon, self, self.ID_PRINT,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Toolbar buttons: Editing
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Cut\tCut\tCut selection to clipboard.", cuticon, self.editor, FXText.ID_CUT_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Copy\tCopy\tCopy selection to clipboard.", copyicon, self.editor, FXText.ID_COPY_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Paste\tPaste\tPaste clipboard.", pasteicon, self.editor, FXText.ID_PASTE_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Undo\tUndo\tUndo last change.", undoicon, self.undolist, FXUndoList.ID_UNDO,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Redo\tRedo\tRedo last change.", redoicon, self.undolist, FXUndoList.ID_REDO,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Fonts & Help
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Fonts\tFonts\tDisplay font dialog.", fontsicon,
self, self.ID_FONT, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Help\tHelp on editor\tDisplay help information.", helpicon,
self, self.ID_SHOW_HELP, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# File Menu entries
! FXMenuCommand(filemenu, "&Open...\tCtl-O\tOpen document file.", openicon,
self, self.ID_OPEN)
FXMenuCommand(filemenu, "Open Selected\tCtl-E\tOpen highlighted document file.", None,
--- 286,325 ----
# Toolbar buttons: File manipulation
! FXButton(toolbar, "New\tNew\tCreate new document.", self.newicon, self, self.ID_NEW,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Open\tOpen\tOpen document file.", self.openicon, self, self.ID_OPEN,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Save\tSave\tSave document.", self.saveicon, self, self.ID_SAVE,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Save As\tSave As\tSave document to another file.", self.saveasicon,
self, self.ID_SAVEAS, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Toolbar buttons: Print
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Print\tPrint\tPrint document.", self.printicon, self, self.ID_PRINT,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Toolbar buttons: Editing
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Cut\tCut\tCut selection to clipboard.", self.cuticon, self.editor, FXText.ID_CUT_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Copy\tCopy\tCopy selection to clipboard.", self.copyicon, self.editor, FXText.ID_COPY_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Paste\tPaste\tPaste clipboard.", self.pasteicon, self.editor, FXText.ID_PASTE_SEL,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Undo\tUndo\tUndo last change.", self.undoicon, self.undolist, FXUndoList.ID_UNDO,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Redo\tRedo\tRedo last change.", self.redoicon, self.undolist, FXUndoList.ID_REDO,
ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# Fonts & Help
FXFrame(toolbar, LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 5, 5)
! FXButton(toolbar, "Fonts\tFonts\tDisplay font dialog.", self.fontsicon,
self, self.ID_FONT, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
! FXButton(toolbar, "Help\tHelp on editor\tDisplay help information.", self.helpicon,
self, self.ID_SHOW_HELP, ICON_ABOVE_TEXT|BUTTON_TOOLBAR|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
# File Menu entries
! FXMenuCommand(filemenu, "&Open...\tCtl-O\tOpen document file.", self.openicon,
self, self.ID_OPEN)
FXMenuCommand(filemenu, "Open Selected\tCtl-E\tOpen highlighted document file.", None,
***************
*** 324,332 ****
FXMenuCommand(filemenu, "&Reopen...\t\tReopen file.", None,
self, self.ID_REOPEN)
! FXMenuCommand(filemenu, "&New...\tCtl-N\tCreate new document.", newicon,
self, self.ID_NEW)
! FXMenuCommand(filemenu, "&Save\tCtl-S\tSave document.", saveicon,
self, self.ID_SAVE)
! FXMenuCommand(filemenu, "Save &As...\t\tSave document to another file.", saveasicon,
self, self.ID_SAVEAS)
FXMenuSeparator(filemenu)
--- 327,335 ----
FXMenuCommand(filemenu, "&Reopen...\t\tReopen file.", None,
self, self.ID_REOPEN)
! FXMenuCommand(filemenu, "&New...\tCtl-N\tCreate new document.", self.newicon,
self, self.ID_NEW)
! FXMenuCommand(filemenu, "&Save\tCtl-S\tSave document.", self.saveicon,
self, self.ID_SAVE)
! FXMenuCommand(filemenu, "Save &As...\t\tSave document to another file.", self.saveasicon,
self, self.ID_SAVEAS)
FXMenuSeparator(filemenu)
***************
*** 335,339 ****
FXMenuCommand(filemenu, "Extract to file...\t\tExtract text to file.", None,
self, self.ID_EXTRACT_FILE)
! FXMenuCommand(filemenu, "&Print...\tCtl-P\tPrint document.", printicon,
self, self.ID_PRINT)
FXMenuCommand(filemenu, "&Editable\t\tDocument editable.", None,
--- 338,342 ----
FXMenuCommand(filemenu, "Extract to file...\t\tExtract text to file.", None,
self, self.ID_EXTRACT_FILE)
! FXMenuCommand(filemenu, "&Print...\tCtl-P\tPrint document.", self.printicon,
self, self.ID_PRINT)
FXMenuCommand(filemenu, "&Editable\t\tDocument editable.", None,
***************
*** 363,369 ****
# Edit Menu entries
! FXMenuCommand(editmenu, "&Undo\tCtl-Z\tUndo last change.", undoicon,
self.undolist, FXUndoList.ID_UNDO)
! FXMenuCommand(editmenu, "&Redo\tCtl-R\tRedo last undo.", redoicon,
self.undolist, FXUndoList.ID_REDO)
FXMenuCommand(editmenu, "&Undo all\t\tUndo all.", None,
--- 366,372 ----
# Edit Menu entries
! FXMenuCommand(editmenu, "&Undo\tCtl-Z\tUndo last change.", self.undoicon,
self.undolist, FXUndoList.ID_UNDO)
! FXMenuCommand(editmenu, "&Redo\tCtl-R\tRedo last undo.", self.redoicon,
self.undolist, FXUndoList.ID_REDO)
FXMenuCommand(editmenu, "&Undo all\t\tUndo all.", None,
***************
*** 374,384 ****
self.undolist, FXUndoList.ID_REVERT)
FXMenuSeparator(editmenu)
! FXMenuCommand(editmenu, "&Copy\tCtl-C\tCopy selection to clipboard.", copyicon,
self.editor, FXText.ID_COPY_SEL)
! FXMenuCommand(editmenu, "C&ut\tCtl-X\tCut selection to clipboard.", cuticon,
self.editor, FXText.ID_CUT_SEL)
! FXMenuCommand(editmenu, "&Paste\tCtl-V\tPaste from clipboard.", pasteicon,
self.editor, FXText.ID_PASTE_SEL)
! FXMenuCommand(editmenu, "&Delete\t\tDelete selection.", deleteicon,
self.editor, FXText.ID_DELETE_SEL)
FXMenuSeparator(editmenu)
--- 377,387 ----
self.undolist, FXUndoList.ID_REVERT)
FXMenuSeparator(editmenu)
! FXMenuCommand(editmenu, "&Copy\tCtl-C\tCopy selection to clipboard.", self.copyicon,
self.editor, FXText.ID_COPY_SEL)
! FXMenuCommand(editmenu, "C&ut\tCtl-X\tCut selection to clipboard.", self.cuticon,
self.editor, FXText.ID_CUT_SEL)
! FXMenuCommand(editmenu, "&Paste\tCtl-V\tPaste from clipboard.", self.pasteicon,
self.editor, FXText.ID_PASTE_SEL)
! FXMenuCommand(editmenu, "&Delete\t\tDelete selection.", self.deleteicon,
self.editor, FXText.ID_DELETE_SEL)
FXMenuSeparator(editmenu)
***************
*** 445,449 ****
FXMenuCommand(optionmenu, "Preferences...\t\tChange preferences.", None,
self, self.ID_PREFERENCES)
! FXMenuCommand(optionmenu, "Font...\t\tChange text font.", fontsicon,
self, self.ID_FONT)
FXMenuCommand(optionmenu, "Overstrike\t\tToggle overstrike mode.",
--- 448,452 ----
FXMenuCommand(optionmenu, "Preferences...\t\tChange preferences.", None,
self, self.ID_PREFERENCES)
! FXMenuCommand(optionmenu, "Font...\t\tChange text font.", self.fontsicon,
self, self.ID_FONT)
FXMenuCommand(optionmenu, "Overstrike\t\tToggle overstrike mode.",
***************
*** 466,470 ****
# Help Menu entries
! FXMenuCommand(helpmenu, "&Help...\t\tDisplay help information.", helpicon,
self.helpwindow, self.ID_SHOW);
FXMenuSeparator(helpmenu)
--- 469,473 ----
# Help Menu entries
! FXMenuCommand(helpmenu, "&Help...\t\tDisplay help information.", self.helpicon,
self.helpwindow, self.ID_SHOW);
FXMenuSeparator(helpmenu)
***************
*** 628,634 ****
"cursorcolor", FXRGB(255,0,0))
! # Delimeters
! delimeters = self.getApp().reg().readStringEntry("SETTINGS",
! "delimeters", """~.,/\\`'!@#$%^&*()-=+{}|[]\":;<>?""")
# Get size
--- 631,637 ----
"cursorcolor", FXRGB(255,0,0))
! # Delimiters
! delimiters = self.getApp().reg().readStringEntry("SETTINGS",
! "delimiters", """~.,/\\`'!@#$%^&*()-=+{}|[]\":;<>?""")
# Get size
***************
*** 690,695 ****
self.editor.setCursorColor(cursorcolor)
! # Change delimeters
! # self.editor.setDelimeters(delimeters)
# Hide the tree if asked for
--- 693,698 ----
self.editor.setCursorColor(cursorcolor)
! # Change delimiters
! # self.editor.setDelimiters(delimiters)
# Hide the tree if asked for
***************
*** 750,757 ****
self.editor.getCursorColor())
! # Delimeters
! # delimeters = self.editor.getDelimiters()
! # self.getApp().reg().writeStringEntry("SETTINGS", "delimeters",
! # delimeters)
# Write new window size back to registry
--- 753,760 ----
self.editor.getCursorColor())
! # Delimiters
! # delimiters = self.editor.getDelimiters()
! # self.getApp().reg().writeStringEntry("SETTINGS", "delimiters",
! # delimiters)
# Write new window size back to registry
***************
*** 879,883 ****
# Update reopen file
! def onUpdRevert(self, sender, sel, ptr):
if self.filenameset:
sender.handle(self, MKUINT(FXWindow.ID_ENABLE, SEL_COMMAND), ptr)
--- 882,886 ----
# Update reopen file
! def onUpdReopen(self, sender, sel, ptr):
if self.filenameset:
sender.handle(self, MKUINT(FXWindow.ID_ENABLE, SEL_COMMAND), ptr)
***************
*** 1275,1284 ****
sender.handle(self, MKUINT(ID_SETINTVALUE, SEL_COMMAND), value)
! # Change word delimeters
! def onCmdDelimeters(self, sender, sel, ptr):
pass
! # Update word delimeters
! def onUpdDelimeters(self, sender, sel, ptr):
pass
--- 1278,1287 ----
sender.handle(self, MKUINT(ID_SETINTVALUE, SEL_COMMAND), value)
! # Change word delimiters
! def onCmdDelimiters(self, sender, sel, ptr):
pass
! # Update word delimiters
! def onUpdDelimiters(self, sender, sel, ptr):
pass
|
