Changeset 1454

Timestamp:

07/03/08 18:42:01 (5 months ago)

Author:

rob

Message:

Fixed #18: Completed basic ctags support
* modified showLine to display the line at the top of the screen

Location:

trunk/peppy

Files:

• fundamental.py (modified) (1 diff)
• plugins/cursor_movement.py (modified) (1 diff)
• plugins/project.py (modified) (4 diffs)
• stcbase.py (modified) (1 diff)

trunk/peppy/fundamental.py

@@ -595 +595 @@
             line = int(url.fragment)
             line -= self.classprefs.line_number_offset
-            self.GotoLine(line)
-            self.EnsureVisible(line)
+            self.showLine(line)
 
     ##### Comment handling

trunk/peppy/plugins/cursor_movement.py

@@ -126 +126 @@
         # stc counts lines from zero, but displayed starting at 1.
         #dprint("goto line = %d" % line)
-        mode.EnsureVisible(line - 1)
-        mode.GotoLine(line - 1)
+        mode.showLine(line - 1)
 
 

trunk/peppy/plugins/project.py

@@ -83 +83 @@
                     file = match.group(2)
                     addr = match.group(3)
-                    fields = match.group(4).split('\t')
+                    fields = match.group(4)
                     self.dprint("tag=%s file=%s addr=%s field=%s" % (tag, file, addr, str(fields)))
                     if tag not in self.tags:
@@ -175 +175 @@
             self.tags = self.mode.project_info.getTag(lookup)
             if self.tags:
-                links = [t[0] for t in self.tags]
+                links = []
+                for t in self.tags:
+                    info = ''
+                    fields = t[2].split('\t')
+                    for field in fields:
+                        if ':' in field:
+                            info += field + " "
+                    if info:
+                        info += "in "
+                    info += t[0]
+                    links.append(info)
                 return links
         return [_('No suggestions')]
@@ -188 +198 @@
         except:
             pass
-        self.frame.findTabOrOpen(file)
+        url = self.mode.project_info.project_top_dir.resolve2(file)
+        self.frame.findTabOrOpen(url)
 
 
@@ -348 +359 @@
     default_menu = ("Project", -990)
 
+    def isEnabled(self):
+        return bool(self.mode.project_info)
+    
     def action(self, index=-1, multiplier=1):
         if self.mode.project_info:

trunk/peppy/stcbase.py

@@ -573 +573 @@
         # expand folding if any
         self.EnsureVisible(line)
+        
+        # Make line appear at the top of the screen.  ScrollToLine doesn't seem
+        # to work when applied right after a GotoLine, but moving to the end
+        # of the document and then back does seem to put the line at the top
+        # of the screen
+        self.GotoLine(self.GetLineCount())
         self.GotoLine(line)
-        self.ScrollToLine(line + self.LinesOnScreen() - 3)
-        self.GotoLine(line)
+#        dprint("After first GotoLine(%d): FirstVisibleLine = %d" % (line, self.GetFirstVisibleLine()))
+#        self.ScrollToLine(line + self.LinesOnScreen() - 3)
+#        dprint("After first ScrollToLine(%d): FirstVisibleLine = %d" % (line + self.LinesOnScreen() - 3, self.GetFirstVisibleLine()))
+#        self.GotoLine(line)
+#        dprint("After second GotoLine(%d): FirstVisibleLine = %d" % (line, self.GetFirstVisibleLine()))
         self.ScrollToColumn(0)