Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /newedit/src/, /newedit/src/images/, /newedit/src/mixins/

newedit
Discussion topic

Back to topic list

CVS update: /newedit/src/, /newedit/src/images/, /newedit/src/mixins/

Reply

Author limodou
Full name limodou
Date 2004-05-14 23:20:50 PDT
Message User: limodou
Date: 04/05/14 23:20:50

Added:
 /newedit/src/images/
  close.gif, closeall.gif, findnext.gif, format.gif, replace.gif, saveall.gif

Modified:
 /newedit/src/
  ChangeLog.txt
 /newedit/src/mixins/
  Editor.py, EditorCtrl.py, OnModified.py, Search.py, __init__.py

Log:
 set scroll width; onupdateui; and other

File Changes:

Directory: /newedit/src/
========================

File [changed]: ChangeLog.txt
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/ChangeLo​g.txt?r1=1.5&r2=​1.6
Delta lines: +6 -0
-------------------
--- ChangeLog.txt 15 May 2004 02:20:56 -0000 1.5
+++ ChangeLog.txt 15 May 2004 06:20:47 -0000 1.6
@@ -1,3 +1,9 @@
+[2004/05/15]
+Search.py Ôö¼Óreplace¹¤¾ß°´Å¥
+OnUpdateUI.py Ôö¼Ó¶Ôcut, copy, paste, undo, redo, save¹¤¾ß¡¢²Ëµ¥µÄ¶¯Ì¬¸üÐÂ
+SetScrollWidth.py Ôö¼Ó³õʼÉèÖÃStyledTe​xtCtrlºáÏò¹ö¶¯Ìõ¿í¶È​
+Editor.py ²åÈë¹â±ê¿í¶ÈÉèΪ3£¬µ​÷ÕûµÚÒ»ÁÐmarginΪ·ûº​Ŷø²»ÊÇÐкÅ
+
 [2004/05/14]
 Search.py Ôö¼Ó²éÕÒ¡¢Ìæ»»¹¦ÄÜ£¬​Ôö¼Ó¹¤¾ßÌõÏÔʾ£¬½«Ñ¡​ÖÐÎı¾Ö±½Ó½øÐвéÕÒ¹¦​ÄÜ
 EditCtrl.py Ôö¼Ó¹Ø±Õ´°¿ÚʱÌáʾ±£´æÎļþ

Directory: /newedit/src/images/
===============================

File [added]: close.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/c​lose.gif?rev=1.1​&content-type=text/v​nd.viewcvs-markup
File [added]: closeall.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/c​loseall.gif?rev=1.1​&content-type=tex​t/vnd.viewcvs-markup​
File [added]: findnext.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/f​indnext.gif?rev=1.1​&content-type=tex​t/vnd.viewcvs-markup​
File [added]: format.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/f​ormat.gif?rev=1.1​&content-type=text/​vnd.viewcvs-markup
File [added]: replace.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/r​eplace.gif?rev=1.1​&content-type=text​/vnd.viewcvs-markup
File [added]: saveall.gif
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/images/s​aveall.gif?rev=1.1​&content-type=text​/vnd.viewcvs-markup
Directory: /newedit/src/mixins/
===============================

File [changed]: Editor.py
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/mixins/E​ditor.py?r1=1.3&​r2=1.4
Delta lines: +20 -16
---------------------
--- Editor.py 15 May 2004 02:20:56 -0000 1.3
+++ Editor.py 15 May 2004 06:20:47 -0000 1.4
@@ -32,23 +32,26 @@
         self.SetMargins(0,0) #set left and right outer margins to 0 width
         self.setLineNumberMargin()
 
- self.SetMarginWidth(1, 16) #margin 1 for symbols, 16 px wide
- self.SetMarginType(1, wx.stc.STC_MARGIN_SYMBOL)
+ #set caret width
+ self.SetCaretWidth(3)
 
- #Setup a margin to hold fold markers
- self.SetMarginType(2, wx.stc.STC_MARGIN_SYMBOL) #margin 2 for symbols
- self.SetMarginMask(2, wx.stc.STC_MASK_FOLDERS) #set up mask for folding symbols
- self.SetMarginSensitive(2, True) #this one needs to be mouse-aware
- self.SetMarginWidth(2, 16) #set margin 2 16 px wide
+ self.SetMarginWidth(0, 16) #margin 1 for symbols, 16 px wide
+ self.SetMarginType(0, wx.stc.STC_MARGIN_SYMBOL)
 
- #define folding markers
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEREND, wx.stc.STC_MARK_BOXP​LUSCONNECTED, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEROPENMID, wx.stc.STC_MARK_BOXM​INUSCONNECTED, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERMIDTAIL, wx.stc.STC_MARK_TCORNER, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERTAIL, wx.stc.STC_MARK_LCORNER, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERSUB, wx.stc.STC_MARK_VLINE, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DER, wx.stc.STC_MARK_BOXPLUS, "white", "black")
- self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEROPEN, wx.stc.STC_MARK_BOXMINUS, "white", "black")
+ #Setup a margin to hold fold markers
+# self.SetMarginType(2, wx.stc.STC_MARGIN_SYMBOL) #margin 2 for symbols
+# self.SetMarginMask(2, wx.stc.STC_MASK_FOLDERS) #set up mask for folding symbols
+# self.SetMarginSensitive(2, True) #this one needs to be mouse-aware
+# self.SetMarginWidth(2, 16) #set margin 2 16 px wide
+#
+# #define folding markers
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEREND, wx.stc.STC_MARK_BOXP​LUSCONNECTED, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEROPENMID, wx.stc.STC_MARK_BOXM​INUSCONNECTED, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERMIDTAIL, wx.stc.STC_MARK_TCORNER, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERTAIL, wx.stc.STC_MARK_LCORNER, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DERSUB, wx.stc.STC_MARK_VLINE, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DER, wx.stc.STC_MARK_BOXPLUS, "white", "black")
+# self.MarkerDefine(wx​.stc.STC_MARKNUM_FOL​DEROPEN, wx.stc.STC_MARK_BOXMINUS, "white", "black")
 
         #INTERFACE: editor,setevent,win
         self.callplugin('init', self)
@@ -56,7 +59,8 @@
     def setLineNumberMargin(self):
         lines = self.GetLineCount() #get # of lines, ensure text is loaded first!
         width = self.TextWidth(wx.st​c.STC_STYLE_LINENUMB​ER, str(9999)+' ')
- self.SetMarginWidth(0, width)
+ self.SetMarginType(1, wx.stc.STC_MARGIN_NUMBER )
+ self.SetMarginWidth(1, width)
 
     def reset(self, filename):
         self.filename = filename

File [changed]: EditorCtrl.py
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/mixins/E​ditorCtrl.py?r1=1.5​&r2=1.6
Delta lines: +1 -1
-------------------
--- EditorCtrl.py 15 May 2004 02:20:56 -0000 1.5
+++ EditorCtrl.py 15 May 2004 06:20:47 -0000 1.6
@@ -123,7 +123,7 @@
         return pagetitle
 
     def showPageTitle(self, ctrl):
- title = os.path.basename(sel​f.getDispTitle(ctrl)​)
+ title = os.path.basename(ctr​l.getFilename())
         index = self.getIndex(ctrl)
         if title != self.GetPageText(index):
             self.SetPageText(sel​f.getIndex(ctrl), title)

File [changed]: OnModified.py
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/mixins/O​nModified.py?r1=1.4​&r2=1.5
Delta lines: +1 -0
-------------------
--- OnModified.py 15 May 2004 02:20:56 -0000 1.4
+++ OnModified.py 15 May 2004 06:20:47 -0000 1.5
@@ -11,4 +11,5 @@
     else:
         win.SetSavePoint()
         win.editctrl.showTitle(win)
+ win.callplugin('onmodified', win)
 Mixin.setMixin('editor', 'OnModified', OnModified)

File [changed]: Search.py
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/mixins/S​earch.py?r1=1.4&​r2=1.5
Delta lines: +4 -2
-------------------
--- Search.py 15 May 2004 02:20:56 -0000 1.4
+++ Search.py 15 May 2004 06:20:47 -0000 1.5
@@ -13,7 +13,7 @@
     [
         (401, 'IDM_SEARCH_FIND', 'Find...\tCtrl+F', wx.ITEM_NORMAL, 'OnSearchFind', 'Find text'),
         (402, 'IDM_SEARCH_DIRECTFIND', 'Direct Find\tF4', wx.ITEM_NORMAL, 'OnSearchDirectFind', 'Direct find selected text'),
- (403, 'IDM_SEARCH_REPLACE', 'Find & Replace...\tCtrl+H', wx.ITEM_NORMAL, 'OnSearchReplace', 'Find and replace text'),
+ (403, 'IDM_SEARCH_REPLACE', 'Replace...\tCtrl+H', wx.ITEM_NORMAL, 'OnSearchReplace', 'Find and replace text'),
         (404, 'IDM_SEARCH_FIND_NEXT', 'Find Next\tF3', wx.ITEM_NORMAL, 'OnSearchFindNext', 'Find next occurance of text'),
         (405, 'IDM_SEARCH_FIND_PREVIOUS', 'Find Previous\tShift+F3', wx.ITEM_NORMAL, 'OnSearchFindPrev', 'Find previous occurance of text'),
     ]),
@@ -22,12 +22,14 @@
 
 toollist = [
     (220, 'find'),
- (230, '|'),
+ (230, 'replace'),
+ (240, '|'),
 ]
 Mixin.setMixin('mainframe', 'toollist', toollist)
 
 toolbaritems = {
     'find':('IDM_SEARCH_FIND', 'images/find.gif', 'find', 'Find text', 'OnSearchFind'),
+ 'replace':('IDM_SEAR​CH_REPLACE', 'images/replace.gif', 'replace', 'Find and replace text', 'OnSearchReplace'),
 }
 Mixin.setMixin('mainframe', 'toolbaritems', toolbaritems)
 

File [changed]: __init__.py
Url: http://newedit.tigri​s.org/source/browse/​newedit/src/mixins/_​_init__.py?r1=1.5​&r2=1.6
Delta lines: +2 -0
-------------------
--- __init__.py 15 May 2004 02:20:56 -0000 1.5
+++ __init__.py 15 May 2004 06:20:47 -0000 1.6
@@ -16,4 +16,6 @@
     'OnPosition',
     'Lineending',
     'DClickCloseFile',
+ 'OnUpdateUI',
+ 'SetScrollWidth',
 ]




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@newe​dit.tigris.org
For additional commands, e-mail: cvs-help at newedit dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /newedit/src/, /newedit/src/images/, /newedit/src/mixins/ limodou limodou 2004-05-14 23:20:50 PDT
Messages per page: