Changeset 808

Timestamp:

09/07/05 14:33:36 (3 years ago)

Author:

tzanko

Message:

nbshell: worked on tickets #13 and #16

Files:

• nbshell/trunk/ChangeLog (modified) (1 diff)
• nbshell/trunk/nbshell/PythonPlugin.py (modified) (2 diffs)
• nbshell/trunk/nbshell/Sheet.py (modified) (1 diff)

nbshell/trunk/ChangeLog

@@ +1 @@
+09.07.2005:
+
+    * Fixed a bug in copy/paste according to ticket #13
+
+    * Deleted help message in the beginning (ticket #16)
-09.05.2005:
-

nbshell/trunk/nbshell/PythonPlugin.py

@@ -346 +346 @@
-        if len(self.line2log) == 0:
-            self.line2log.append(None) #the window always has at least one line
+        else:
+            self.line2log.append(None) #append ane empty line at the end
+            outtext.write('\n')
-        self.window.SetText(outtext.getvalue())
-        self.window.GotoPos(self.window.GetTextLength())
@@ -832 +835 @@
-        if not wx.TheClipboard.Open():
-            return
-
+
+
-            if wx.TheClipboard.IsSupported(wx.CustomDataFormat('nbCell')):
-                codecell = True
-                wx.TheClipboard.GetData(cellobj)
-        else:
+            #we are inside a cell. 
-            if wx.TheClipboard.IsSupported(wx.CustomDataFormat('nbCode')):
-                codetext = True
-                wx.TheClipboard.GetData(codeobj)
+            #if we are at the last character in the cell and there is a nbCell object
+            elif ((len(self.line2log) -1 == linenum or #if linenum is the last line in the cell
+                   self.line2log[linenum+1] is None or
+                   self.line2log[linenum+1][0] != self.line2log[linenum][0]) and
+                  #and caret is at the end of the line
+                  pos == self.window.PositionFromLine(linenum) +\
+                         self.window.LineLength(linenum)):
+                linenum += 1 #this will be the place where we paste the cells
+                wx.TheClipboard.GetData(cellobj)
+                codecell = True
-            elif (wx.TheClipboard.IsSupported(wx.DataFormat(wx.DF_TEXT)) or
-
+wx.
-                rawtext = True
-                wx.TheClipboard.GetData(textobj)

nbshell/trunk/nbshell/Sheet.py

@@ -411 +411 @@
-        #We only need to set self.last
-        self.element = self.notebook.default_sheet()
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
-        # Now remove the old sheet and replace it with the new one
-        oldsheet = self.notebook.root.find('sheet')