[SCM] python-pyo/master: Removing conflict.
tiago at users.alioth.debian.org
tiago at users.alioth.debian.org
Fri Jan 30 04:34:09 UTC 2015
The following commit has been merged in the master branch:
commit 69b5b798ec7aba40f2a7b7d3803f83385f4b7caf
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date: Thu Jan 29 23:30:27 2015 -0500
Removing conflict.
diff --git a/utils/E-Pyo.py b/utils/E-Pyo.py
index dfb2ae7..af435fe 100755
--- a/utils/E-Pyo.py
+++ b/utils/E-Pyo.py
@@ -17,11 +17,17 @@ import __builtin__
__builtin__.EPYO_APP_OPENED = True
if sys.platform == "linux2":
+<<<<<<< HEAD
+ WX_VERSION = '3.0'
+ import wxversion
+ wxversion.select(WX_VERSION)
+=======
import wxversion
if wxversion.checkInstalled("3.0"):
wxversion.select("3.0")
elif wxversion.checkInstalled("2.8"):
wxversion.select("2.8")
+>>>>>>> upstream/0.7.4
import os, string, inspect, keyword, wx, codecs, subprocess, unicodedata
import contextlib, StringIO, shutil, copy, pprint, random, time, threading
@@ -33,7 +39,11 @@ import wx.lib.scrolledpanel as scrolled
import wx.lib.dialogs
import wx.combo
import wx.stc as stc
+<<<<<<< HEAD
+import FlatNotebook as FNB
+=======
import wx.lib.agw.flatnotebook as FNB
+>>>>>>> upstream/0.7.4
from pyo import *
from PyoDoc import ManualFrame
@@ -739,9 +749,13 @@ KEY_COMMANDS = {
"31. Alt + 'V'": "Line Paste",
"32. Alt + CLICK + DRAG": "Rectangular selection",
"33. Shit + Return": "Show the init line of a pyo object in a tooltip",
+<<<<<<< HEAD
+"34. Ctrl/Cmd + Return": "Show the __doc__ string of a python object, module or function"
+=======
"34. Ctrl/Cmd + Return": "Show the __doc__ string of a python object, module or function",
"35. CLICK in the most left margin": "Add a marker to the corresponding line",
"36. Shift + CLICK on a marker": "Delete the marker"
+>>>>>>> upstream/0.7.4
}
############## Allowed Extensions ##############
@@ -1965,8 +1979,11 @@ class MainFrame(wx.Frame):
self.Bind(wx.EVT_MENU, self.save, id=wx.ID_SAVE)
menu1.Append(wx.ID_SAVEAS, "Save As...\tShift+Ctrl+S")
self.Bind(wx.EVT_MENU, self.saveas, id=wx.ID_SAVEAS)
+<<<<<<< HEAD
+=======
menu1.Append(100, "Save As Template...")
self.Bind(wx.EVT_MENU, self.saveasTemplate, id=100)
+>>>>>>> upstream/0.7.4
# TODO : printing not working well enough
#menu1.AppendSeparator()
#menu1.Append(wx.ID_PREVIEW, "Print Preview")
@@ -2494,6 +2511,12 @@ class MainFrame(wx.Frame):
self.panel.editor.FoldAll()
else:
self.panel.editor.ExpandAll()
+<<<<<<< HEAD
+
+ def foldExpandScope(self, evt):
+ self.panel.editor.foldExpandCurrentScope()
+=======
+>>>>>>> upstream/0.7.4
def foldExpandScope(self, evt):
self.panel.editor.foldExpandCurrentScope()
@@ -3311,8 +3334,12 @@ class MainPanel(wx.Panel):
#######################################################
### The idea of EditorPanel is to allow multiple views
+<<<<<<< HEAD
+### at the same time in a single notebook page.
+=======
### at the same time in a single notebook page.
### Also: A tree view of classes and functions of the file
+>>>>>>> upstream/0.7.4
### Not yet implemented... ( TODO )
#######################################################
class EditorPanel(wx.Panel):
@@ -3486,10 +3513,13 @@ class Editor(stc.StyledTextCtrl):
fline = fline.replace("/", " ")
last = fline.split()[-1]
ext = {"python": "py", "bash": "sh", "sh": "sh"}.get(last, "")
+<<<<<<< HEAD
+=======
else:
text = f.read()
if "desc:" in text:
ext = "jsfx"
+>>>>>>> upstream/0.7.4
except:
pass
if ext in ["py", "pyw", "c5"]:
@@ -3511,7 +3541,7 @@ class Editor(stc.StyledTextCtrl):
self.StyleSetSpec(stc.STC_P_OPERATOR, buildStyle('operator'))
self.StyleSetSpec(stc.STC_P_IDENTIFIER, buildStyle('default'))
self.StyleSetSpec(stc.STC_P_COMMENTBLOCK, buildStyle('commentblock'))
- elif ext in ["c", "cc", "cpp", "cxx", "cs", "h", "hh", "hpp", "hxx"]:
+ elif ext in ["c", "cc", "cpp", "cxx", "cs", "h", "hh", "hpp", "hxx", "jsfx-inc"]:
self.SetLexer(stc.STC_LEX_CPP)
self.SetStyleBits(self.GetStyleBitsNeeded())
self.SetProperty('fold.comment', '1')
@@ -3671,6 +3701,14 @@ class Editor(stc.StyledTextCtrl):
self.anchor1 = startpos = selection[0]
self.anchor2 = selection[1]
while startpos != -1:
+<<<<<<< HEAD
+ startpos = self.FindText(self.anchor1, self.anchor2, findTxt)
+ if startpos != -1:
+ endpos = startpos+len(findTxt)
+ self.SetSelection(startpos, endpos)
+ self.ReplaceSelection(evt.GetReplaceString())
+ self.anchor1 = endpos + 1
+=======
startpos = self.FindText(self.anchor1, self.anchor2, findTxt, evt.GetFlags())
if startpos != -1:
endpos = startpos+len(findTxt)
@@ -3678,6 +3716,7 @@ class Editor(stc.StyledTextCtrl):
self.ReplaceSelection(newTxt)
self.anchor1 = startpos + newStrLen + 1
self.anchor2 += diffLen
+>>>>>>> upstream/0.7.4
line = self.GetCurrentLine()
halfNumLinesOnScreen = self.LinesOnScreen() / 2
self.ScrollToLine(line - halfNumLinesOnScreen)
@@ -4082,6 +4121,27 @@ class Editor(stc.StyledTextCtrl):
dlg.ShowModal()
except:
pass
+<<<<<<< HEAD
+
+ def navigateMarkers(self, down=True):
+ if self.markers_dict != {}:
+ llen = len(self.markers_dict)
+ keys = sorted(self.markers_dict.keys())
+ if down:
+ self.current_marker += 1
+ else:
+ self.current_marker -= 1
+ if self.current_marker < 0:
+ self.current_marker = llen - 1
+ elif self.current_marker >= llen:
+ self.current_marker = 0
+ line = keys[self.current_marker]
+ self.GotoLine(line)
+ halfNumLinesOnScreen = self.LinesOnScreen() / 2
+ self.ScrollToLine(line - halfNumLinesOnScreen)
+ self.GetParent().GetParent().GetParent().GetParent().markers.setSelected(self.current_marker)
+=======
+>>>>>>> upstream/0.7.4
def OnChar(self, evt):
propagate = True
@@ -4402,6 +4462,21 @@ class Editor(stc.StyledTextCtrl):
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
lineNum = lineNum + 1
+<<<<<<< HEAD
+
+ def ExpandAll(self):
+ lineCount = self.GetLineCount()
+ lineNum = 0
+ while lineNum < lineCount:
+ level = self.GetFoldLevel(lineNum)
+ if level & stc.STC_FOLDLEVELHEADERFLAG and \
+ (level & stc.STC_FOLDLEVELNUMBERMASK) == stc.STC_FOLDLEVELBASE:
+ self.SetFoldExpanded(lineNum, True)
+ lineNum = self.Expand(lineNum, True)
+ lineNum = lineNum - 1
+ lineNum = lineNum + 1
+
+=======
def ExpandAll(self):
lineCount = self.GetLineCount()
@@ -4415,6 +4490,7 @@ class Editor(stc.StyledTextCtrl):
lineNum = lineNum - 1
lineNum = lineNum + 1
+>>>>>>> upstream/0.7.4
def ToggleFoldAll(self):
lineCount = self.GetLineCount()
expanding = True
--
python-pyo packaging
More information about the pkg-multimedia-commits
mailing list