sabel-ide

git clone https://pyrossh.dev/repos/sabel-ide.git

sabel-ide

2b9c3b6a — pyros2097

v0.60 Added new font chooser in menu Added new progress bar and status update Added stop for functions

Files changed (25) hide show

Widget/adb.py +16 -43
Widget/adb.pyc +0 -0
Widget/ant.py +41 -39
Widget/command.py +6 -4
Widget/dialogs.py +81 -27
Widget/editor.py +35 -10
Widget/editor.pyc +0 -0
Widget/lexersquirrel.py +20 -24
Widget/parser.py +4 -0
Widget/tab.py +1 -0
Widget/tab.pyc +0 -0
Widget/tool.py +72 -8
Widget/tree.py +158 -6
Widget/tree.pyc +0 -0
build/exe.win32-2.7/Sabel.exe +0 -0
build/exe.win32-2.7/Sabel.zip +0 -0
build/exe.win32-2.7/config.yml +17 -8
build/exe.win32-2.7/library.zip +0 -0
config.py +16 -0
config.yml +15 -10
cx.py +1 -1
globals.py +4 -1
main.py +1 -1
mainwindow.py +13 -5
window.py +171 -57

Widget/adb.py CHANGED Viewed

@@ -9,7 +9,6 @@ class Adb(QWidget):
         QWidget.__init__(self,parent)
         self.parent = parent
         self.adb_thread = WorkThread()
-        self.timer = QTimer()
         self.adblist = config.adb()
         self.device = ""
         self.setDevice()
@@ -17,40 +16,6 @@ class Adb(QWidget):
         self.connect(self.adb_thread, SIGNAL("update"),self.update)
         self.connect(self.adb_thread, SIGNAL("fini"),self.newstart)
         #self.connect(self.timer , SIGNAL('timeout()') , self.onTimeout)
-        #self.connect(self.adb_thread , SIGNAL('started()') , self.onThreadStarted)
-        #self.connect(self.adb_thread , SIGNAL('finished()'), self.onThreadFinished)
-    def onTimeout(self):
-        print "timeout"
-        """
-        # Update the progress bar
-        value = self.pbar.value()
-        # Going forward or backwards?
-        if self.pbar.invertedAppearance():
-            if value-2 < self.pbar.minimum():
-                self.pbar.setValue(self.pbar.minimum())
-                self.pbar.setInvertedAppearance(False)
-            else:
-                self.pbar.setValue(value-2)
-        else:
-            if value+2 > self.pbar.maximum():
-                self.pbar.setValue(self.pbar.maximum())
-                self.pbar.setInvertedAppearance(True)
-            else:
-                self.pbar.setValue(value+2)
-        """
-    def onThreadStarted(self):
-        print "Thread has been started"
-        self.timer.start(10)
-        #self.enableButtons(False)
-    def onThreadFinished(self):
-        print "Thread has finished"
-        self.timer.stop()
-        #self.enableButtons(True)
-        #self.pbar.setValue(0)
     def setDevice(self):
         if(config.device() == 1):
@@ -75,25 +40,34 @@ class Adb(QWidget):
         self.parent.textEdit.append(line)
     def checkFinished(self,no,cmd):
+        self.parent.progressStop()
         if(no == 0):
-            self.parent.textEdit.append("Finshed: "+cmd)
+            self.parent.textEdit.append("Finished: "+cmd)
         else:
-            self.parent.textEdit.append("Error Canceled: "+cmd)
+            self.parent.textEdit.append("Error: "+cmd)
     def newstart(self,no,cmd):
         self.checkFinished(no, cmd)
+        self.parent.progressStart()
         if(cmd == self.cmd1):
             self.adb_thread.setCmd(self.cmd2)
             self.adb_thread.run()
         elif(cmd == self.cmd2):
             self.adb_thread.setCmd(self.cmd3)
+            self.parent.progressStop()
             self.adb_thread.run2()
         elif(cmd == self.cmd3):
             self.adb_thread.setCmd(self.cmd4)
             self.adb_thread.run()
         elif(cmd == self.cmd4):
             self.adb_thread.setCmd(self.cmd5)
-            self.adb_thread.run()
+            self.adb_thread.run()
+        elif(cmd == self.cmd5):
+            if not(self.parent.tabWidget_3.isHidden()):
+                self.parent.tabWidget_3.hide()
+            self.parent.toolBar.action_Run.setEnabled(True)
+            self.parent.progressStop()
+            self.parent.statusWriting()
     def run(self):
         if self.isRunning == False:
@@ -106,17 +80,16 @@ class Adb(QWidget):
             self.parent.textEdit.clear()
         self.parent.textEdit.append("Pushing main.nut...\n")
         self.adb_thread.setCmd(self.cmd1)
+        self.parent.statusRunning()
+        self.parent.progressStart()
-        self.adb_thread.run()
+        self.adb_thread.run()
     def stop(self):
         if self.isRunning == True:
             self.isRunning = False
             self.parent.toolBar.action_Stop.setDisabled(True)
             self.parent.textEdit.append("Stopped.")
-            if not(self.parent.tabWidget_3.isHidden()):
-                self.parent.tabWidget_3.hide()
+            self.parent.statusStopping()
-            self.parent.toolBar.action_Run.setEnabled(True)
             self.adb_thread.close_process()
             #"adb -d shell ps | grep "+adblist[3]+" | awk '{print $2}' | xargs adbshell kill")
             #adb -d shell ps | grep com.emo_framework.examples | awk '{print $2}' | xargs adb shell kill

Widget/adb.pyc CHANGED Viewed

Binary file

Widget/ant.py CHANGED Viewed

@@ -1,5 +1,5 @@
-from globals import ospathjoin
+from globals import ospathjoin,config
-from PyQt4.QtGui import QWidget
+from PyQt4.QtGui import QWidget,QMessageBox
 from PyQt4.QtCore import pyqtSignal,SIGNAL,QThread,QProcess,QString,QTimer
 from workthread import WorkThread
@@ -8,53 +8,42 @@ class Ant(QWidget):
     def __init__(self,parent):
         QWidget.__init__(self,parent)
         self.parent = parent
+        self.setAntList()
         self.ant_thread = WorkThread()
         self.timer = QTimer()
         #self.ant_thread = antThread()
         self.connect(self.ant_thread, SIGNAL("update"),self.update)
         self.connect(self.ant_thread, SIGNAL("fini"),self.newstart)
-        #self.connect(self.timer , SIGNAL('timeout()') , self.onTimeout)
+        self.connect(self.timer , SIGNAL('timeout()') , self.onTimeout)
         #self.connect(self.ant_thread , SIGNAL('started()') , self.onThreadStarted)
         #self.connect(self.ant_thread , SIGNAL('finished()'), self.onThreadFinished)
     def onTimeout(self):
         print "timeout"
-        """
-        # Update the progress bar
-        value = self.pbar.value()
-        # Going forward or backwards?
-        if self.pbar.invertedAppearance():
-            if value-2 < self.pbar.minimum():
-                self.pbar.setValue(self.pbar.minimum())
-                self.pbar.setInvertedAppearance(False)
-            else:
-                self.pbar.setValue(value-2)
-        else:
-            if value+2 > self.pbar.maximum():
-                self.pbar.setValue(self.pbar.maximum())
-                self.pbar.setInvertedAppearance(True)
-            else:
-                self.pbar.setValue(value+2)
-        """
-    def onThreadStarted(self):
-        print "Thread has been started"
-        self.timer.start(10)
-        #self.enableButtons(False)
-    def onThreadFinished(self):
-        print "Thread has finished"
-        self.timer.stop()
-        #self.enableButtons(True)
-        #self.pbar.setValue(0)
     def update(self,line):
         self.parent.textEdit.append(line)
+    def setAntList(self):
+        self.antlist = config.ant()
+        self.cmd1 = self.antlist[0]
+        self.cmd2 = self.antlist[1]
+        self.cmd3 = self.antlist[2]
+        self.cmd4 = self.antlist[3]
+        self.cmd5 = self.antlist[4]
-    def newstart(self,no,cmd):
+    def checkFinished(self,no,cmd):
+        if(no == 0):
+            #QMessageBox.about(self,"Error","Finished: "+cmd)
-        self.parent.textEdit.append("Finished")
+            self.parent.textEdit.append("Finished: "+cmd)
+        else:
-        self.parent.textEdit.append(cmd)
+            self.parent.textEdit.append("Error: "+cmd)
+    def newstart(self,no,cmd):
+        self.checkFinished(no, cmd)
+        self.parent.progressStop()
+        self.parent.statusWriting()
     def showOutput(self):
         if(self.parent.tabWidget_3.isHidden()):
             self.parent.tabWidget_3.show()
@@ -66,7 +55,9 @@ class Ant(QWidget):
         self.showOutput()
         self.parent.textEdit.clear()
         self.parent.textEdit.append("Creating... "+prj.getPath())
-        self.ant_thread.setCmd("android.bat update project -p "+prj.getPath())
+        self.ant_thread.setCmd(self.cmd1+" "+prj.getPath())
+        self.parent.progressStart()
+        self.parent.statusCreating()
         self.ant_thread.run()
     def build(self,prj):
@@ -75,7 +66,9 @@ class Ant(QWidget):
         self.showOutput()
         self.parent.textEdit.clear()
         self.parent.textEdit.append("Ant Building Debug... "+ospathjoin(prj.getPath(),"build.xml"))
-        self.ant_thread.setCmd("ant.bat debug -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
+        self.ant_thread.setCmd(self.cmd2+" "+ospathjoin(prj.getPath(),"build.xml"))
+        self.parent.progressStart()
+        self.parent.statusBuilding()
         self.ant_thread.run()
     def clean(self,prj):
@@ -84,7 +77,9 @@ class Ant(QWidget):
         self.showOutput()
         self.parent.textEdit.clear()
         self.parent.textEdit.append("Ant Cleaning... "+prj.getPath())
-        self.ant_thread.setCmd("ant.bat clean -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
+        self.ant_thread.setCmd(self.cmd5+" "+ospathjoin(prj.getPath(),"build.xml"))
+        self.parent.progressStart()
+        self.parent.statusCleaning()
         self.ant_thread.run()
     def buildRun(self,prj):
@@ -93,7 +88,8 @@ class Ant(QWidget):
         self.showOutput()
         self.parent.textEdit.clear()
         self.parent.textEdit.append("Ant Building and Installing... "+ospathjoin(prj.getPath(),"build.xml"))
-        self.ant_thread.setCmd("ant.bat debug install -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
+        self.ant_thread.setCmd(self.cmd4+" "+ospathjoin(prj.getPath(),"build.xml"))
+        self.parent.progressStart()
         self.ant_thread.run()
     def run(self,prj):
@@ -102,9 +98,15 @@ class Ant(QWidget):
         self.showOutput()
         self.parent.textEdit.clear()
         self.parent.textEdit.append("Installing... "+prj.getPath())
-        self.ant_thread.setCmd("ant.bat installd -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
+        self.ant_thread.setCmd(self.cmd3+" "+ospathjoin(prj.getPath(),"build.xml"))
+        self.parent.progressStart()
+        self.parent.statusInstalling()
         self.ant_thread.run()
+    def kill(self):
+        self.ant_thread.kill_process()
+        self.ant_thread.close_process()
     def close(self):
         self.ant_thread.kill_process()
         self.ant_thread.close_process()

Widget/command.py CHANGED Viewed

@@ -26,12 +26,12 @@ class Command(QWidget):
         self.run()
     def finished(self,no,cmd):
+        self.parent.progressStop()
+        self.parent.statusWriting()
         if(no == 0):
-            self.parent.textEdit.append("Finished")
+            self.parent.textEdit.append("Finished: "+cmd)
-            self.parent.textEdit.append(cmd)
         else:
-            self.parent.textEdit.append("Error Canceled")
+            self.parent.textEdit.append("Error: "+cmd)
-            self.parent.textEdit.append(cmd)
     def update(self,line):
         self.parent.textEdit.append(line)
@@ -42,6 +42,8 @@ class Command(QWidget):
     def run(self):
         self.cmdThread.setCmd(self.cmd)
+        self.parent.progressStart()
+        self.parent.statusCommand()
         self.cmdThread.run()
     def close(self):

Widget/dialogs.py CHANGED Viewed

@@ -2,7 +2,7 @@ from PyQt4 import QtGui
 from PyQt4 import QtCore
 from globals import config
 from globals import PY_VERSION,__version__,OS_NAME,Icons
-from datetime import datetime
+from tree import BrowseTree
 class DialogAndroid(QtGui.QDialog):
     def __init__(self, parent):
@@ -67,7 +67,6 @@ class DialogAndroid(QtGui.QDialog):
         self.buttonBox.setGeometry(QtCore.QRect(40, 370, 341, 32))
         self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
         self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
-        self.buttonBox.setObjectName(("buttonBox"))
         self.tabWidget.setCurrentIndex(1)
         self.setWindowTitle("Tools")
         self.label_2.setText("Push Main File:")
@@ -79,13 +78,24 @@ class DialogAndroid(QtGui.QDialog):
         self.lineEdit_3.setText(config.adb()[1])
         self.lineEdit_4.setText(config.adb()[2])
         self.lineEdit_5.setText(config.adb()[3])
-        self.fileButton.clicked.connect(self.getFile)
+        self.fileButton.clicked.connect(self.showBrowse)
+        self.browsedialog = DialogBrowse(self)
+        self.browsedialog.tree.itemDoubleClicked.connect(self.getName)
+    def getName(self,item):
+        if(item.isFile()):
+            if(item.isDoc()):
+                self.browsedialog.accept()
+                self.getFile(item.getPath())
+    def showBrowse(self):
+        self.browsedialog.show()
-    def getFile(self):
+    def getFile(self,fname = ""):
-        fname = str(QtGui.QFileDialog.getOpenFileName(self,"Open File", '.', "Files (*.*)"))
         if not (fname == ""):
-            val = []
+            val = []
+            fname = fname.replace("\\","/")
+            print fname
             self.lineEdit_2.setText(fname+" /sdcard/")
             val.append(str(self.lineEdit_2.text()))
             val.append(str(self.lineEdit_3.text()))
@@ -102,52 +112,95 @@ class DialogAndroid(QtGui.QDialog):
             val.append(str(self.lineEdit_4.text()))
             val.append(str(self.lineEdit_5.text()))
             config.setAdb(val)
+            self.parent().adb.setAdbList()
         self.close()
     def setDevice(self,val):
         config.setDevice(val)
         self.parent().adb.setDevice()
+class DialogBrowse(QtGui.QDialog):
+    def __init__(self, parent):
+        QtGui.QDialog.__init__(self, parent)
+        self.resize(400, 420)
+        self.horizontalLayoutWidget = QtGui.QWidget(self)
+        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 400, 400))
+        self.tree = BrowseTree()
+        self.horizontalLayout = QtGui.QHBoxLayout(self.horizontalLayoutWidget)
+        self.horizontalLayout.setMargin(0)
+        self.horizontalLayout.addWidget(self.tree)
+        self.tree.initProjects()
 class DialogAnt(QtGui.QDialog):
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         QtGui.QDialog.__init__(self, parent)
         self.resize(400, 420)
         self.horizontalLayoutWidget = QtGui.QWidget(self)
         self.horizontalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 401, 361))
         self.horizontalLayout = QtGui.QHBoxLayout(self.horizontalLayoutWidget)
         self.horizontalLayout.setMargin(0)
         self.tabWidget = QtGui.QTabWidget(self.horizontalLayoutWidget)
         self.tab_4 = QtGui.QWidget()
         self.formLayoutWidget = QtGui.QWidget(self.tab_4)
         self.formLayoutWidget.setGeometry(QtCore.QRect(10, 10, 361, 311))
         self.formLayout = QtGui.QFormLayout(self.formLayoutWidget)
         self.formLayout.setMargin(0)
-        self.label_2 = QtGui.QLabel(self.formLayoutWidget)
+        label_1 = QtGui.QLabel(self.formLayoutWidget)
+        self.lineEdit_1 = QtGui.QLineEdit(self.formLayoutWidget)
-        self.formLayout.setWidget(0, QtGui.QFormLayout.SpanningRole, self.label_2)
+        self.formLayout.setWidget(0, QtGui.QFormLayout.SpanningRole,label_1)
+        self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.lineEdit_1)
+        label_2 = QtGui.QLabel(self.formLayoutWidget)
         self.lineEdit_2 = QtGui.QLineEdit(self.formLayoutWidget)
-        self.lineEdit_2.setText((""))
+        self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole,label_2)
-        self.formLayout.setWidget(1, QtGui.QFormLayout.SpanningRole, self.lineEdit_2)
+        self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.lineEdit_2)
+        label_3 = QtGui.QLabel(self.formLayoutWidget)
         self.lineEdit_3 = QtGui.QLineEdit(self.formLayoutWidget)
-        self.lineEdit_3.setText((""))
+        self.formLayout.setWidget(4, QtGui.QFormLayout.SpanningRole,label_3)
-        self.formLayout.setWidget(3, QtGui.QFormLayout.SpanningRole, self.lineEdit_3)
+        self.formLayout.setWidget(5, QtGui.QFormLayout.SpanningRole, self.lineEdit_3)
-        self.label_3 = QtGui.QLabel(self.formLayoutWidget)
-        self.formLayout.setWidget(2, QtGui.QFormLayout.SpanningRole, self.label_3)
-        self.label_4 = QtGui.QLabel(self.formLayoutWidget)
+        label_4 = QtGui.QLabel(self.formLayoutWidget)
-        self.formLayout.setWidget(5, QtGui.QFormLayout.SpanningRole, self.label_4)
         self.lineEdit_4 = QtGui.QLineEdit(self.formLayoutWidget)
-        self.lineEdit_4.setText((""))
+        self.formLayout.setWidget(6, QtGui.QFormLayout.SpanningRole,label_4)
-        self.formLayout.setWidget(6, QtGui.QFormLayout.SpanningRole, self.lineEdit_4)
+        self.formLayout.setWidget(7, QtGui.QFormLayout.SpanningRole, self.lineEdit_4)
-        self.label_5 = QtGui.QLabel(self.formLayoutWidget)
+        label_5 = QtGui.QLabel(self.formLayoutWidget)
-        self.formLayout.setWidget(7, QtGui.QFormLayout.SpanningRole, self.label_5)
         self.lineEdit_5 = QtGui.QLineEdit(self.formLayoutWidget)
-        self.lineEdit_5.setText((""))
+        self.formLayout.setWidget(8, QtGui.QFormLayout.SpanningRole,label_5)
-        self.formLayout.setWidget(8, QtGui.QFormLayout.SpanningRole, self.lineEdit_5)
+        self.formLayout.setWidget(9, QtGui.QFormLayout.SpanningRole, self.lineEdit_5)
+        self.buttonBox = QtGui.QDialogButtonBox(self)
+        self.buttonBox.setGeometry(QtCore.QRect(40, 370, 341, 32))
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
+        self.buttonBox.clicked.connect(self.update)
+        label_1.setText("Create Android Project")
+        label_2.setText("Build")
+        label_3.setText("Install")
+        label_4.setText("Build and Install")
+        label_5.setText("Clean")
+        self.lineEdit_1.setText(config.ant()[0])
+        self.lineEdit_2.setText(config.ant()[1])
+        self.lineEdit_3.setText(config.ant()[2])
+        self.lineEdit_4.setText(config.ant()[3])
+        self.lineEdit_5.setText(config.ant()[4])
-        self.tabWidget.addTab(self.tab_4, (""))
+        self.tabWidget.addTab(self.tab_4,"Ant")
+        self.setWindowTitle("Ant")
         self.horizontalLayout.addWidget(self.tabWidget)
+    def update(self,btn):
+        val = []
+        if(btn.text() == "OK"):
+            val.append(str(self.lineEdit_1.text()))
+            val.append(str(self.lineEdit_2.text()))
+            val.append(str(self.lineEdit_3.text()))
+            val.append(str(self.lineEdit_4.text()))
+            val.append(str(self.lineEdit_5.text()))
+            config.setAnt(val)
+            self.parent().ant.setAntList()
+        self.close()
 class DialogSquirrel(QtGui.QDialog):
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)
@@ -326,6 +379,7 @@ class DialogTodo(QtGui.QDialog):
         item = self.list.takeTopLevelItem(self.list.indexOfTopLevelItem(self.list.currentItem()))
         self.taskList.remove(item.text(0))
         config.setTodo(self.taskList)
 class DialogAbout2(QtGui.QDialog):
     def __init__(self, parent=None):

Widget/editor.py CHANGED Viewed

@@ -16,7 +16,7 @@ class Editor(QsciScintilla):
         self.colorStyle = colorStyle
         self.errorLines = []
         self.setUtf8(True)
-        self.setText(QString(text))
+        self.setText(text)
         if(eol == 0):
             self.setEolMode(self.EolWindows)
         elif(eol == 1):
@@ -30,17 +30,13 @@ class Editor(QsciScintilla):
         #Margin
         #print self.marginType(self.SymbolMargin)
         # Clickable margin 1 for showing markers
-        self.setMarginSensitivity(1, True)
+        self.setMarginSensitivity(0, True)
-        self.setMarginsBackgroundColor(self.colorStyle.margin)
+        #self.setMarginsBackgroundColor(self.colorStyle.margin)
         self.connect(self,SIGNAL('marginClicked(int, int, Qt::KeyboardModifiers)'),self.on_margin_clicked)
         # Margin 0 is used for line numbers
         #self.setMarginLineNumbers(0, True)
         #self.setMarginWidth(0, self.fontmetrics.width("0000") + 6)
-        self.setMarginLineNumbers(0, True)
+        self.setMargin(config.margin())
-        if(self.lines()<1000):
-            self.setMarginWidth(0, QString("-------"))
-        else:
-            self.setMarginWidth(0, QString("---------"))
         #self.linesChanged.connect(self.changeMarginWidht())
         #Caret
         self.setCaretLineBackgroundColor(self.colorStyle.caret)
@@ -91,9 +87,13 @@ class Editor(QsciScintilla):
         self.api.load(ospathjoin(apiDir,"emo.api"))
         self.api.prepare()
         self.lexer.setAPIs(self.api) #Very important do not change line otherwise gg
+        self.setAutoIndent(True)
+        self.setBackspaceUnindents(True)
+        self.setIndent(config.indent())
         self.setLexer(self.lexer) #Very important do not change line otherwise gg
     def setColorStyle(self,colorStyle):
         self.colorStyle = colorStyle
         self.setCaretLineBackgroundColor(self.colorStyle.caret)
@@ -149,16 +149,41 @@ class Editor(QsciScintilla):
         self.lexer.setFont(self.font)
         self.setMarginsFont(self.font)
-    def setFontName(self,name):
+    def setFontName(self):
-        self.font.setFamily(name)
+        self.font.setFamily(config.fontName())
+        self.lexer.setFont(self.font)
+    def setFontSize(self):
+        self.font.setPointSize(config.fontSize())
         self.lexer.setFont(self.font)
+    def setMargin(self,mar):
+        if(mar == 1):
+            self.setMarginLineNumbers(1, True)
+            if(self.lines()<1000):
+                self.setMarginWidth(1, QString("-------"))
+            else:
+                self.setMarginWidth(1, QString("---------"))
+        else:
+            self.setMarginLineNumbers(1, False)
+            self.setMarginWidth(1, QString("---"))
+    def setIndent(self,val):
+        if(val == 0):
+            self.setIndentationGuides(False)
+        else:
+            self.setIndentationGuides(True)
     def setThreshold(self,val):
         self.setAutoCompletionThreshold(val)
     def setLine(self,lineno):
+        self.setFocus(True)
         self.setCursorPosition(int(lineno),0)
         self.setCaretLineVisible(True)
     """

Widget/editor.pyc CHANGED Viewed

Binary file

Widget/lexersquirrel.py CHANGED Viewed

@@ -33,6 +33,8 @@ class LexerSquirrel(QsciLexerPython):
     def __init__(self,colorStyle, parent = None):
         QsciLexerPython.__init__(self, parent)
+        self.setV2UnicodeAllowed(True)
+        #self.setHighlightSubidentifiers(True)
         #self.parent = parent
         #self.sci = self.parent
         #print self.FunctionMethodName
@@ -61,26 +63,23 @@ class LexerSquirrel(QsciLexerPython):
         }
         """
         self.styles = [
-          #index description color paper font eol
+          #index description color paper font eol
           QsciStyle(0, QString("base"), self.colorStyle.color, self.colorStyle.paper, self.plainFont, True),
-          QsciStyle(1, QString("comment"), QColor("#008000"), self.colorStyle.paper, self.plainFont, True),
+          QsciStyle(1, QString("comment"), QColor("#3f7f5f"), self.colorStyle.paper, self.plainFont, True),
-          QsciStyle(2, QString("number"), QColor("#008000"), self.colorStyle.paper, self.boldFont, False),
+          QsciStyle(2, QString("number"), QColor("#008000"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(3, QString("DoubleQuotedString"), QColor("#008000"), self.colorStyle.paper, self.plainFont, True),
           QsciStyle(4, QString("SingleQuotedString"), QColor("#008000"), self.colorStyle.paper, self.plainFont, True),
-          QsciStyle(5, QString("Keyword"), QColor("#00003f"), self.colorStyle.paper, self.boldFont, True),
+          QsciStyle(5, QString("Keyword"), QColor("#7f0055"), self.colorStyle.paper, self.boldFont, True),
           QsciStyle(6, QString("TripleSingleQuotedString"), QColor("#ffd0d0"),self.colorStyle.paper, self.plainFont, True),
           QsciStyle(7, QString("TripleDoubleQuotedString"),QColor("#001111"),self.colorStyle.paper, self.plainFont, False),
           QsciStyle(8, QString("ClassName"), QColor("#000000"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(9, QString("FunctionMethodName"), QColor("#000000"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(10, QString("Operator"), QColor("#ff00ff"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(11, QString("Identifier"), QColor("#000000"), self.colorStyle.paper, self.plainFont, False),
-          QsciStyle(12, QString("CommentBlock"), QColor("#000000"), self.colorStyle.paper, self.plainFont, False),
+          QsciStyle(12, QString("CommentBlock"), QColor("#3f5fbf"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(13, QString("UnclosedString"), QColor("#010101"), self.colorStyle.paper, self.plainFont, False),
           QsciStyle(14, QString("HighlightedIdentifier"), QColor("#0000ff"), self.colorStyle.paper, self.plainFont, False),
-          QsciStyle(15, QString("Decorator"), QColor("#ff00ff"), self.colorStyle.paper, self.plainFont, False)
+          QsciStyle(15, QString("Decorator"), QColor("#ff00ff"), self.colorStyle.paper, self.plainFont, False),
-          #QsciStyle(7, QString("MultiComment_start"), QColor("#ff00ff"), QColor("#001111"), self.plainFont, False),
-          #QsciStyle(8, QString("MultiComment"), QColor("#ff00ff"), QColor("#001111"), self.plainFont, False),
-          #QsciStyle(9, QString("MultiComment_stop"), QColor("#ff00ff"), QColor("#001111"), self.plainFont, False)
         ]
         self._foldcompact = True
@@ -167,21 +166,18 @@ class LexerSquirrel(QsciLexerPython):
             length = len(line)
             # We must take care of empty lines.This is done here.
             if length == 1:
+                return
-                if prevState == self.styles[8] or prevState == self.styles[7]:
+            if line.startswith('@@'):
-                    newState = self.styles[8]
+                newState = self.styles[1]
-                else:
-                    newState = self.styles[0]
-            #if line.startswith('#'):
-            #    newState = self.styles[3]
-            #elif line.startswith('\t+') or line.startswith('    +'):
+            elif line.startswith('\t+') or line.startswith('    +'):
-            #    newState = self.styles[3]
+                newState = self.styles[3]
             #We work with a non empty line.
             else:
                 if line.startswith('@'):
-                    newState = self.styles[7]
+                    newState = self.styles[1]
                 elif line.startswith('@'):
-                    if prevState == self.styles[8] or prevState == self.styles[7]:
+                    if prevState == self.styles[1] or prevState == self.styles[1]:
-                        newState = self.styles[9]
+                        newState = self.styles[1]
                     else:
                         newState = self.styles[0]
                 #elif line.startswith('//'):
@@ -215,7 +211,7 @@ class LexerSquirrel(QsciLexerPython):
                                 newState = self.styles[2]
                                 wordLength = len('class')
                         elif line[i:].startswith('function'):
-                                newState = self.styles[3]
+                                newState = self.styles[5]
                                 wordLength = len('function')
                         elif line[i:].startswith(' if'):
                                 newState = self.styles[4]
@@ -224,13 +220,13 @@ class LexerSquirrel(QsciLexerPython):
                                 newState = self.styles[4]
                                 wordLength = length
                         elif line[i:].startswith('//'):
-                                newState = self.styles[4]
+                                newState = self.styles[1]
                                 wordLength = length
                         elif line[i:].startswith('/*'):
-                                newState = self.styles[4]
+                                newState = self.styles[1]
                                 wordLength = length
                         elif line[i:].startswith('*/'):
-                                newState = self.styles[4]
+                                newState = self.styles[1]
                                 wordLength = length
                         #else:
                             #newState = self.styles[0]

Widget/parser.py CHANGED Viewed

@@ -34,10 +34,14 @@ class Parser(QWidget):
     def run(self,nfile):
         if(nfile.endswith(".nut")):
             self.par_thread.setCmd(sqc+" "+nfile)
+            self.parent.statusParsing()
+            self.parent.progressStart()
             self.par_thread.run()
     def stop(self):
         self.par_thread.close_process()
+        self.parent.statusWriting()
+        self.parent.progressStop()
     def close(self):
         self.par_thread.kill_process()

Widget/tab.py CHANGED Viewed

@@ -107,6 +107,7 @@ class TreeTab(QTabWidget):
 class OutputTab(QTabWidget):
     def __init__(self,parent):
         QTabWidget.__init__(self,parent)
 class Tiler(QTabWidget):

Widget/tab.pyc CHANGED Viewed

Binary file

Widget/tool.py CHANGED Viewed

@@ -1,4 +1,5 @@
-from PyQt4.QtGui import QToolBar, QMenu, QAction, QSlider, QWidgetAction
+from PyQt4.QtGui import (QToolBar, QMenu, QAction, QSlider, QWidgetAction, QFontDatabase,
+                         QFont, QComboBox, QLabel)
 from PyQt4.QtCore import SIGNAL, Qt, QSize
 from globals import config, Icons
@@ -24,8 +25,13 @@ class Tool(QToolBar):
         self.action_SaveAll.triggered.connect(self.parent.fileSaveAll)
         self.action_SaveAll.setToolTip("Save All Files")
-        self.action_Help = QAction(Icons.toc_open, 'Help', self)
+        self.action_Build = QAction(Icons.thread_view, 'Build', self)
+        self.action_Build.setShortcut('Ctrl+B')
-        self.action_Help.triggered.connect(self.parent.help)
+        self.action_Build.triggered.connect(self.parent.build_project)
+        self.action_Debug = QAction(Icons.debug_exec, 'Debug', self)
         self.action_Run = QAction(Icons.run, 'Run', self)
         self.action_Run.setShortcut('Ctrl+R')
         self.action_Run.triggered.connect(self.parent.adb.run)
@@ -39,6 +45,8 @@ class Tool(QToolBar):
         self.action_Design.triggered.connect(self.parent.design)
         self.action_Todo = QAction(Icons.task_set, 'Todo', self)
         self.action_Todo.triggered.connect(self.parent.todo)
+        self.action_Help = QAction(Icons.toc_open, 'Help', self)
+        self.action_Help.triggered.connect(self.parent.help)
         men = QMenu()
@@ -70,12 +78,42 @@ class Tool(QToolBar):
         self.iconSlider.setOrientation(Qt.Horizontal)
         self.iconSlider.setValue(config.iconSize())
         self.iconSlider.setMinimum(16)
-        self.iconSlider.setMaximum(60)
+        self.iconSlider.setMaximum(32)
         self.iconSlider.setSingleStep(2)
         self.iconSlider.valueChanged.connect(self.setIcon)
         self.iconSliderAction = QWidgetAction(men)
         self.iconSliderAction.setDefaultWidget(self.iconSlider)
+        '''Font Button'''
+        self.fontCombo = QComboBox()
+        #self.fontCombo.setStyleSheet("QPushButton {text-align:center;color:blue;text-decoration:underline;font-family:arial; background-color:#d4d0c8; }")
+        database = QFontDatabase()
+        idx = 0
+        for fam in database.families():
+            #font = QFont(fam)
+            #font.setFixedPitch(True)
+            #font.setPointSize(10)
+            #text = QLabel(fam)
+            #text.setFont(font)
+            self.fontCombo.addItem(Icons.font,fam)
+            if(fam == config.fontName()):
+               self.fontCombo.setCurrentIndex(idx)
+               #self.fontCombo.setFont(font)
+            idx+= 1
+        self.fontCombo.currentIndexChanged.connect(self.parent.setFontName)
+        self.fontComboMenu = QWidgetAction(men)
+        self.fontComboMenu.setDefaultWidget(self.fontCombo)
+        '''Font Size'''
+        self.fontSizeCombo = QComboBox()
+        for size in range(0,40):
+            self.fontSizeCombo.addItem(str(size+1))
+            if(size == config.fontSize()):
+               self.fontSizeCombo.setCurrentIndex(size)
+        self.fontSizeCombo.currentIndexChanged.connect(self.parent.setFontSize)
+        self.fontSizeComboMenu = QWidgetAction(men)
+        self.fontSizeComboMenu.setDefaultWidget(self.fontSizeCombo)
         action_explorer = QAction("Show Explorer",self)
         action_explorer.triggered.connect(self.parent.exp)
@@ -84,18 +122,39 @@ class Tool(QToolBar):
         action_designer = QAction("Show Designer",self)
         action_designer.triggered.connect(self.parent.design)
         action_Indentation = QAction("Indentation Guides",self)
+        action_Indentation.triggered.connect(self.parent.setIndent)
+        action_Margin = QAction("Line Numbers",self)
+        action_Margin.triggered.connect(self.parent.setMargin)
+        action_Android = QAction(Icons.android,'Android', self)
+        action_Android.triggered.connect(self.parent.android)
+        action_Ant = QAction(Icons.ant_view,'Ant', self)
+        action_Ant.triggered.connect(self.parent.antt)
+        action_Squirrel = QAction(Icons.nut,'Squirrel', self)
+        action_Squirrel.triggered.connect(self.parent.squirrel)
+        action_Ios1 = QAction(Icons.ios,'iOS', self)
+        men.addAction(action_Android)
+        men.addAction(action_Ant)
+        men.addAction(action_Squirrel)
+        men.addAction(action_Ios1)
+        men.addSeparator()
         men.addAction(action_explorer)
         men.addAction(action_console)
         men.addAction(action_designer)
         men.addAction(action_Indentation)
+        men.addAction(action_Margin)
+        men.addSeparator()
+        men.addAction(QAction("Font",self))
+        men.addAction(self.fontComboMenu)
+        men.addAction(QAction("Font Size",self))
+        men.addAction(self.fontSizeComboMenu)
         men.addSeparator()
         men.addAction(QAction("TabWidth",self))
         men.addAction(self.tabsSliderAction)
         men.addSeparator()
         men.addAction(QAction("Threshold",self))
         men.addAction(self.threshSliderAction)
-        men.addAction(QAction("Icon Size",self))
+        #men.addAction(QAction("Icon Size",self))
-        men.addAction(self.iconSliderAction)
+        #men.addAction(self.iconSliderAction)
         self.action_Options = QAction(Icons.emblem_system, 'Options', self)
         self.action_Options.setMenu(men)
@@ -111,7 +170,7 @@ class Tool(QToolBar):
         self.action_Emo = QAction(Icons.emo, 'Emo', self)
         self.action_Emo.setCheckable(True)
         self.action_Emo.triggered.connect(self.parent.emo)
-        self.action_Ios = QAction(Icons.ios, 'iOS', self)
+        self.action_Ios = QAction(Icons.ios, 'ios', self)
         self.action_Ios.setCheckable(True)
         self.action_Ios.triggered.connect(self.parent.ios)
@@ -172,9 +231,11 @@ class Tool(QToolBar):
         self.addAction(self.action_Save)
         self.addAction(self.action_SaveAll)
         self.addSeparator()
+        self.addAction(self.action_Build)
         self.addAction(self.action_Run)
         self.addAction(self.action_RunFile)
         self.addAction(self.action_Stop)
+        self.addAction(self.action_Debug)
         self.addSeparator()
         self.addAction(self.action_Design)
         self.addAction(self.action_Todo)
@@ -194,4 +255,7 @@ class Tool(QToolBar):
     def setIcon(self,val):
         config.setIconSize(val)
-        self.setIconSize(QSize(val,val))
+        self.setIconSize(QSize(val,val))
+    def make_callback(self, param):
+        return lambda:self.parent.setFontName(param)

Widget/tree.py CHANGED Viewed

@@ -86,7 +86,6 @@ class Project(QTreeWidgetItem):
         self.Count += 1
         self.setExpanded(True)
     def getPath(self):
         return self.path
@@ -193,6 +192,7 @@ class ProjectTree(QTreeWidget):
         if(self.closed[self.projects.index(startDir)] == 0):
             i = Project(self,startDir)
             self.addTopLevelItem(i)
+            self.setCurrentItem(i)
             self.readDir(i,startDir)
             self.readMainFiles(i,startDir)
         else:
@@ -215,6 +215,24 @@ class ProjectTree(QTreeWidget):
         self.projects.remove(itemPath)
         config.setProject(self.projects)
         self.takeTopLevelItem(self.indexOfTopLevelItem(item))
+    '''Awesome GG working 1/10/12 5pm'''
+    def getProject(self,nfile):
+        current_item = self.currentItem()
+        if(current_item == None):
+            QMessageBox.about(self,"Please Select or Add a Project First")
+            return None
+        else:
+            '''This is when a project is selected'''
+            if(current_item.parent() == None):
+                pass
+                #print current_item.getPath()
+            else:
+                '''This is when a file or child is selected'''
+                while(current_item.parent() != None):
+                    current_item = self.currentItem().parent()
+                #print current_item.getPath()
+            return current_item
     def addItem(self,links):
         print links
@@ -304,15 +322,15 @@ class ProjectTree(QTreeWidget):
         action_DeleteProject = QAction(Icons.trash,'Delete', self)
         action_DeleteProject.triggered.connect(lambda:self.deleteProject(item))
-        action_CreateProject = QAction('Create', self)
+        action_CreateProject = QAction('Create Android', self)
         action_CreateProject.triggered.connect(lambda:self.create(item))
         action_BuildProject = QAction('Build', self)
         action_BuildProject.triggered.connect(lambda:self.build(item))
-        action_BuildRunProject = QAction('Build and Run', self)
+        action_BuildRunProject = QAction('Build and Install', self)
         action_BuildRunProject.triggered.connect(lambda:self.buildRun(item))
         action_CleanProject = QAction('Clean', self)
         action_CleanProject.triggered.connect(lambda:self.clean(item))
-        action_RunProject = QAction('Run', self)
+        action_RunProject = QAction('Install', self)
         action_RunProject.triggered.connect(lambda:self.run(item))
         if(item.isProject()):
             if not(item.isClosed()):
@@ -532,11 +550,73 @@ class ProjectTree(QTreeWidget):
             except:
                 QMessageBox.about(self,"Error","Could Not Delete The File")
+class BrowseTree(QTreeWidget):
+    def __init__(self,parent = None):
+        QTreeWidget.__init__(self,parent)
+        self.setColumnCount(1)
+        self.setHeaderLabel("Explorer")
+        self.projects = []
+        self.header().setStretchLastSection(False)
+        self.header().setResizeMode(QHeaderView.ResizeToContents)
+    def initProjects(self):
+        if(config.projects() != None):
+            if(len(config.projects()) != None):
+                for pro in config.projects():
+                    self.createProject(pro)
+    def readDir(self,parent,path):
+        for d in oslistdir(path):
+            if  ospathisdir(ospathjoin(path,d)):
+                if not ospathjoin(d).startswith('.'):
+                    i = Dir(parent,d,path)
+                    self.readFiles(i,ospathjoin(path,d))
+    def readMainDir(self,parent,path):
+        for d in oslistdir(path):
+            if  ospathisdir(ospathjoin(path,d)):
+                if not ospathjoin(d).startswith('.'):
+                    i = Dir(parent,d,path)
+                    self.readMainFiles(i,ospathjoin(path,d))
+    def readFiles(self,parent,path):
+        for f in oslistdir(path):
+            if ospathisdir(ospathjoin(path,f)):
+                d = Dir(parent,f,path)
+                self.readFiles(d,ospathjoin(path,f))
+            else:
+                if not ospathjoin(f).startswith('.'):
+                        File(parent,f,path)
+    def readMainFiles(self,parent,path):
+        for f in oslistdir(path):
+            if not ospathisdir(ospathjoin(path,f)):
+                if not ospathjoin(f).startswith('.'):
+                        File(parent,f,path)
+    def createProject(self,startDir):
+        if(ospathexists(startDir)):
+            self.projects.append(startDir)
+            self.addProject(startDir)
+            return True
+        else:
+            QMessageBox.about(self,"Can't Open Project","Project Does Not Exist %s"%startDir)
+            return False
+    def addProject(self,startDir):
+        i = Project(self,startDir)
+        self.addTopLevelItem(i)
+        self.setCurrentItem(i)
+        self.readDir(i,startDir)
+        self.readMainFiles(i,startDir)
 class Error(QTreeWidgetItem):
     def __init__(self,parent,line,text):
         QTreeWidgetItem.__init__(self,parent)
         self.setIcon(0,Icons.error)
+        self.line = line
         self.setText(0,"Line "+line+":      "+text)
 class ErrorFile(QTreeWidgetItem):
@@ -561,11 +641,83 @@ class ErrorTree(QTreeWidget):
     def reset(self):
         if(self.topLevelItemCount() != 0):
             self.clear()
+class Field(QTreeWidgetItem):
+    def __init__(self,parent,name,line):
+        QTreeWidgetItem.__init__(self,parent)
+        self.line = line
+        self.name = name
+        self.setText (0, self.name)
+        self.setIcon(0,Icons.field)
+class Class(QTreeWidgetItem):
+    def __init__(self,parent,name,line):
+        QTreeWidgetItem.__init__(self,parent)
+        self.line = line
+        self.name = name
+        self.setText (0, self.name)
+        self.setIcon(0,Icons.class1)
+class Method(QTreeWidgetItem):
+    def __init__(self,parent,name,line):
+       QTreeWidgetItem.__init__(self,parent)
+       self.line = line
+       self.name = name
+       self.setText (0, self.name)
+       self.setIcon(0,Icons.method)
 class OutlineTree(QTreeWidget):
     def __init__(self,parent = None):
         QTreeWidget.__init__(self,parent)
         self.setColumnCount(1)
         self.header().close()
-        self.setContextMenuPolicy(Qt.CustomContextMenu)
+        self.header().setStretchLastSection(False)
+        self.header().setResizeMode(QHeaderView.ResizeToContents)
+        self.mainClass = None
+        #item = Class(self,"Hero",50)
+        #self.addTopLevelItem(item)
+        #item2 = Method(item,"say(text)",50)
+        #item3 = Field(item,"hp",50)
+    def parseText(self,source):
+        gg = source.split("\n")
+        idx = 0
+        self.reset()
+        for line in gg:
+            if line.contains("class"):
+                self.addClass(line,idx)
+            elif line.contains("function"):
+                self.addMethod(line,idx)
+            idx += 1
+    def addClass(self,text,lineno):
+        text.remove("{")
+        text.remove("class")
+        text.remove(" ")
+        self.mainClass = Class(self,text,lineno)
+        self.addTopLevelItem(self.mainClass)
+        self.expandAll()
+    def addMethod(self,text,lineno):
+        text.remove("{")
+        text.remove("function")
+        text.remove(" ")
+        if(self.mainClass != None):
+            i = Method(self.mainClass,text,lineno)
+        else:
+            i = Method(self,text,lineno)
+    def addField(self,text,lineno):
+        if(self.mainClass != None):
+            i = Field(self.mainClass,text,lineno)
+        else:
+            i = Field(self,text,lineno)
+    def reset(self):
+        '''Important othewise old reference of mainClass is used'''
+        self.mainClass = None
+        if(self.topLevelItemCount() != 0):
+            self.clear()

Widget/tree.pyc CHANGED Viewed

Binary file

build/exe.win32-2.7/Sabel.exe CHANGED Viewed

Binary file

build/exe.win32-2.7/Sabel.zip CHANGED Viewed

Binary file

build/exe.win32-2.7/config.yml CHANGED Viewed

@@ -1,11 +1,14 @@
 ADB:
-- C:/CODE/assets/main.nut  /sdcard/
+- C:/Android-Template/assets/main.nut /sdcard/
 - com.emo_framework.examples/com.emo_framework.EmoActivity
 - EmoFramework
 - com.emo_framework.examples
 ANT:
-- android update project --target 5 --path .
+- android.bat update project -p
-- ant debug install
+- ant.bat debug -buildfile
+- ant.bat installd -buildfile
+- ant.bat debug install -buildfile
+- ant.bat clean -buildfile
 CMD:
 - CMD
 - PYTHON
@@ -19,24 +22,31 @@ ClosedProject:
 - 0
 - 0
 - 0
+- 0
 File:
-- C:/CODE/assets/howtoscene.nut
 - C:/CODE/assets/creditscene.nut
+- C:/CODE/assets/main.nut
+- C:/CODE/assets/howtoscene.nut
+- C:/CODE/assets/cll.nut
 PARAM:
 - Dude
+- '  C:/CODE/assets/cll.nut'
 Project:
 - C:/CODE/assets/
 - C:/port/
+- C:/Android-Template/
 Recent: []
 Setting:
   device: 1
   fontname: Courier New
-  fontsize: 10
+  fontsize: 9
   iconsize: 16
+  indent: 0
+  margin: 0
   mode: 0
   styleindex: 8
   tabwidth: 2
-  thresh: 2
+  thresh: 1
   workspace: C:/CODE/
 Style: 0
 TODO:
@@ -46,8 +56,7 @@ TODO:
 - Add Style Options
 - Add iOS support
 - Make Mac Build
-- Add Lua and Neko Lexers
 - Dude Thats it for now
 - Squirrel Parser
-- Lua Parser
 - Neko Parser
+- Desginer

build/exe.win32-2.7/library.zip CHANGED Viewed

Binary file

config.py CHANGED Viewed

@@ -38,6 +38,16 @@ class Config:
         return int(self.readSetting('mode'))
     def setMode(self,value):
         self.writeSetting("mode",value)
+    def margin(self):
+        return int(self.readSetting('margin'))
+    def setMargin(self,value):
+        self.writeSetting("margin",value)
+    def indent(self):
+        return int(self.readSetting('indent'))
+    def setIndent(self,value):
+        self.writeSetting("indent",value)
     '''0 is emulator 1 is device'''
     def device(self):
@@ -82,6 +92,12 @@ class Config:
         self.data['ADB'] = val
         self.write()
+    def ant(self):
+        return self.read('ANT')
+    def setAnt(self,val):
+        self.data['ANT'] = val
+        self.write()
     def cmds(self):
         return self.read('CMD')

config.yml CHANGED Viewed

@@ -1,11 +1,14 @@
 ADB:
-- C:/CODE/assets/main.nut  /sdcard/
+- C:/Android-Template/assets/main.nut /sdcard/
 - com.emo_framework.examples/com.emo_framework.EmoActivity
 - EmoFramework
 - com.emo_framework.examples
 ANT:
-- android update project --target 5 --path .
+- android.bat update project -p
-- ant debug install
+- ant.bat debug -buildfile
+- ant.bat installd -buildfile
+- ant.bat debug install -buildfile
+- ant.bat clean -buildfile
 CMD:
 - CMD
 - PYTHON
@@ -21,24 +24,27 @@ ClosedProject:
 - 0
 - 0
 File:
-- C:/CODE/assets/howtoscene.nut
 - C:/CODE/assets/creditscene.nut
+- C:/CODE/assets/main.nut
+- C:/CODE/assets/howtoscene.nut
 PARAM:
-- Dude
+- Dude C:/CODE/assets/creditscene.nut C:/CODE/assets/physics.nut
 Project:
 - C:/CODE/assets/
 - C:/port/
 - C:/Android-Template/
 Recent: []
 Setting:
-  device: 0
+  device: 1
   fontname: Courier New
-  fontsize: 10
+  fontsize: 9
   iconsize: 16
+  indent: 0
+  margin: 0
   mode: 0
   styleindex: 8
   tabwidth: 2
-  thresh: 2
+  thresh: 1
   workspace: C:/CODE/
 Style: 0
 TODO:
@@ -48,8 +54,7 @@ TODO:
 - Add Style Options
 - Add iOS support
 - Make Mac Build
-- Add Lua and Neko Lexers
 - Dude Thats it for now
 - Squirrel Parser
-- Lua Parser
 - Neko Parser
+- Desginer

cx.py CHANGED Viewed

@@ -21,7 +21,7 @@ exe = Executable(
 setup(
     name = "Sabel",
-    version ="0.58",
+    version ="0.60",
     description = "Sabel IDE",
     executables = [exe]
     )

globals.py CHANGED Viewed

@@ -4,7 +4,7 @@ from PyQt4.QtGui import QIcon,QPixmap,QApplication,QSplashScreen
 from send2trash import send2trash
 from config import Config
-__version__ = "0.58"
+__version__ = "0.60"
 #Python accesses local variables much more efficiently than global variables.
 oslistdir = os.listdir
 ospathisdir = os.path.isdir
@@ -117,6 +117,9 @@ class Icons:
     zoomplus = os_icon('zoomplus')
     ios = os_icon('ioss')
     emo = os_icon('emo')
+    method = os_icon('auto_jmeth')
+    class1 = os_icon('auto_class')
+    field = os_icon('auto_field')
 class Auto:
     auto_activity = os_pixmap('auto_activity')

main.py CHANGED Viewed

@@ -4,7 +4,7 @@ __license__ = "GPLv3"
 __copyright__ = 'Copyright (c) 2012, pyros2097'
 __credits__ = ['pyros2097', 'eclipse']
 __email__ = 'pyros2097@gmail.com'
-__version__ = "0.58"
+__version__ = "0.60"
 #TODO:
 #Must learn to destroy editor completely because memory keeps increasing
 #when close tab occurs

mainwindow.py CHANGED Viewed

@@ -29,6 +29,7 @@ class MainWindow(Window):
         self.connect(self.tabWidget,SIGNAL("dropped"), self.createTabs)
         self.tabWidget.tabCloseRequested.connect(self.closeTab)
         self.treeWidget.itemDoubleClicked.connect(self.treeItemClicked)
+        self.outlineWidget.itemDoubleClicked.connect(self.gotoLine)
         self.errorTree.itemDoubleClicked.connect(self.errorLine)
         self.connect(self.treeWidget,SIGNAL("openFileClicked"),self.treeItemClicked)
         self.connect(self.treeWidget,SIGNAL("create"), lambda x:self.ant.create(x))
@@ -54,7 +55,7 @@ class MainWindow(Window):
                 self.openImage(item.getPath())
             elif(item.isAudio()):
                 self.openAudio(item.getPath())
     def initInterpreter(self):
         self.ipy = PyInterp(self)
         self.ipy.initInterpreter(locals())
@@ -89,7 +90,8 @@ class MainWindow(Window):
         text = ""
         try:
             infile = open(nfile, 'r')
-            text = unicode(infile.read())
+            tt = infile.read()
+            text = unicode(tt,"utf-8")#must add utf-8 for it to work
             #infile.close()
             self.files.append(nfile)
@@ -200,6 +202,8 @@ class MainWindow(Window):
                 fname = self.files[index]
                 try:
                     fl = open(fname, 'w')
+                    self.statusSaving()
+                    self.progressStart()
                     tempText = unicode(self.tabWidget.widget(index).text())
                     if tempText:
                         fl.write(tempText.encode("utf-8"))
@@ -209,6 +213,8 @@ class MainWindow(Window):
                         QMessageBox.about(self, "Can't Save","Failed to save ...")
                 except:
                     QMessageBox.about(self, "Can't Save","File is Locked")
+                self.statusWriting()
+                self.progressStop()
                 self.parser.run(self.files[index])
                 #must implement for all files
@@ -219,6 +225,8 @@ class MainWindow(Window):
                 fname = self.files[index]
                 try:
                     fl = open(fname, 'w')
+                    self.statusSaving()
+                    self.progressStart()
                     tempText = unicode(self.tabWidget.widget(index).text())
                     if tempText:
                         fl.write(tempText.encode("utf-8"))
@@ -226,6 +234,8 @@ class MainWindow(Window):
                         self.clearDirty(index)
                     else:
                         QMessageBox.about(self, "Can't Save","Failed to save ...")
+                    self.statusWriting()
+                    self.progressStop()
                 except:
                     QMessageBox.about(self, "Can't Save","File is Locked")
         if(self.files != None):
@@ -246,7 +256,7 @@ class MainWindow(Window):
                 notSaved = True
         if notSaved:
             reply = QMessageBox.question(self,
-                                             "Simple Editor - Unsaved Changes",
+                                             "Sabel - Unsaved Changes",
                                              "Save unsaved changes?",
                                              QMessageBox.Yes|QMessageBox.No|QMessageBox.Cancel)
             if reply == QMessageBox.Cancel:
@@ -265,6 +275,4 @@ class MainWindow(Window):
             lang = 2
         elif nfile.endswith(".neko"):
             lang = 2
-        elif nfile.endswith(".lua"):
-            lang = 2
         return lang

window.py CHANGED Viewed

@@ -1,12 +1,14 @@
 from PyQt4.QtGui import (QAction,QIcon,QMessageBox,QWidgetAction,QMenu,QWidget,
                          QHBoxLayout,QVBoxLayout,QTabWidget,QToolBar,QTextEdit,
                          QLineEdit,QPushButton,QToolButton,QSplitter,QStatusBar,
-                         QMainWindow,QPalette,QColor,QSlider,QFontDialog,QLabel,
+                         QMainWindow,QPalette,QColor,QSlider,QLabel,
-                         QFont,QComboBox,QFileDialog,QInputDialog,QProgressBar)
+                         QFont,QComboBox,QFileDialog,QInputDialog,QProgressBar
+                         )
-from PyQt4.QtCore import QSize,Qt,QStringList
+from PyQt4.QtCore import QSize,Qt,QStringList,SIGNAL,SLOT,QString
 from Widget import (EditorTab,Tiler,TreeTab,OutputTab,
                     ProjectTree,ErrorTree,OutlineTree,
-                    DialogAndroid,DialogAbout,DialogAnt,DialogSquirrel,DialogTodo)
+                    DialogAndroid,DialogAbout,DialogAnt,DialogSquirrel,DialogTodo,
+                    DialogBrowse)
 from Widget.style import Styles
 from stylesheet import *
@@ -44,6 +46,7 @@ class Window(QMainWindow):
         self.tiler = Tiler(self)
         self.tiler.setMinimumHeight(100)
         self.tabWidget.tabBar().setStyleSheet(stletabb)
+        self.tabWidget.currentChanged.connect(self.fileChanged)
         self.tabWidget_2.currentChanged.connect(self.closeExplorer)
         self.tabWidget_3.currentChanged.connect(self.closeConsole)
         self.tabWidget.setTabsClosable(True)
@@ -58,20 +61,8 @@ class Window(QMainWindow):
         self.VerticalLayout_2 = QVBoxLayout(self.tab_5)#QHBoxLayout(self.tab_5)
         self.VerticalLayout_2.setMargin(0)
         self.treeWidget = ProjectTree(self.tab_5)
-        self.treeWidget.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
+        #self.treeWidget.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOn)
-        self.treeWidget.horizontalScrollBar().show()
+        #self.treeWidget.horizontalScrollBar().show()
-        self.treebar = QToolBar()
-        action_Android = QAction(Icons.android,'Android', self)
-        action_Android.triggered.connect(self.android)
-        action_Ant = QAction(Icons.ant_view,'Ant', self)
-        action_Ant.triggered.connect(self.ant)
-        action_Squirrel = QAction(Icons.nut,'Squirrel', self)
-        action_Squirrel.triggered.connect(self.squirrel)
-        self.treebar.addAction(action_Android)
-        self.treebar.addAction(action_Ant)
-        self.treebar.addAction(action_Squirrel)
-        self.treebar.setIconSize(QSize(16,16))
-        self.VerticalLayout_2.addWidget(self.treebar)
         self.VerticalLayout_2.addWidget(self.treeWidget)
         #Outline
@@ -264,13 +255,24 @@ class Window(QMainWindow):
         self.zoomoutButton.setFlat(True)
         self.zoomoutButton.setIcon(Icons.zoomminus)
         self.zoomoutButton.clicked.connect(self.zoomout)
+        '''Status Text, Progress Bar and Stop Button'''
-        self.fontButton = QPushButton(self)
+        self.statusText = QLabel("Writing")
-        self.fontButton.setFlat(True)
+        self.statusText.setMargin(10)
-        self.fontButton.setIcon(Icons.font)
-        self.fontButton.clicked.connect(self.setFont)
         self.progressbar = QProgressBar()
         self.progressbar.setMinimum(0)
         self.progressbar.setMaximum(100)
+        self.stopButton = QPushButton(self)
+        self.stopButton.setFlat(True)
+        self.stopButton.setIcon(Icons.stop)
+        self.stopButton.clicked.connect(self.forceStop)
+        self.progressbar.hide()
+        self.stopButton.hide()
+        self.temp = False
+        self.progress = False
+        self.counter = 0
+        '''Adding all widgets to Status Bar'''
         self.statusbar.addWidget(self.aboutButton)
         self.statusbar.addWidget(self.expButton)
         self.statusbar.addWidget(self.cmdButton)
@@ -278,20 +280,38 @@ class Window(QMainWindow):
         self.statusbar.addWidget(self.findButton)
         self.statusbar.addWidget(self.zoominButton)
         self.statusbar.addWidget(self.zoomoutButton)
-        self.statusbar.addWidget(self.fontButton)
+        #self.statusbar.addWidget(self.fontButton)
+        self.statusbar.addWidget(self.statusText)
-        #self.statusbar.addWidget(self.progressbar)
+        self.statusbar.addWidget(self.progressbar)
-        #self.progressbar.hide()
+        self.statusbar.addWidget(self.stopButton)
         #self.statusbar.setFixedHeight(18)
-        #Init colorstyling
+        ''''Initializing Coloring Style'''
         self.colorStyle = None
         self.initColorStyle()
-        #Init
+        '''Adding Cental Widget and Status Bar'''
         self.setCentralWidget(self.centralwidget)
         self.setStatusBar(self.statusbar)
         self.textEdit.setReadOnly(True)
         #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create('Cleanlooks'))
+    def build_project(self):
+        current_file = self.files[self.tabWidget.currentIndex()]
+        prj = self.treeWidget.getProject(current_file)
+        if(prj != None):
+            self.treeWidget.build(prj)
+    def run_project(self):
+        current_file = self.files[self.tabWidget.currentIndex()]
+        prj = self.treeWidget.getProject(current_file)
+        if(prj != None):
+            self.treeWidget.run(prj)
+    def forceStop(self):
+        self.ant.kill()
+        self.progressStop()
 #-----------------------------------------------------------------------------------#
 #   Menu Actions Functions                                                          #
 #-----------------------------------------------------------------------------------#
@@ -347,7 +367,7 @@ class Window(QMainWindow):
         form = DialogAndroid(self)
         form.show()
-    def ant(self):
+    def antt(self):
         form = DialogAnt(self)
         form.show()
@@ -389,7 +409,8 @@ class Window(QMainWindow):
                 self.tiler.setCurrentIndex(1)
                 self.tiler.hide()
         '''
+    '''The current Changed idx of tabwidget_3 is passed to this a param'''
     def closeConsole(self,no = 2):
         if(no == 2):
             if(self.tabWidget_3.isHidden()):
@@ -397,6 +418,8 @@ class Window(QMainWindow):
             else:
                 self.tabWidget_3.setCurrentIndex(1)
                 self.tabWidget_3.hide()
+    '''The current Changed idx of tabwidget_2 is passed to this a param'''
     def closeExplorer(self,no = 2):
         if(no == 2):
             if(self.tabWidget_2.isHidden()):
@@ -404,9 +427,67 @@ class Window(QMainWindow):
             else:
                 self.tabWidget_2.setCurrentIndex(0)
                 self.tabWidget_2.hide()
+        elif(no == 1):
+            self.fileChanged(no)
+    def fileChanged(self,no):
+        if(self.tabWidget_2.currentIndex() == 1):
+            edt = self.tabWidget.widget(self.tabWidget.currentIndex())
+            source = edt.text()
+            self.outlineWidget.parseText(source)
+    def statusSaving(self):
+        self.statusText.setText("Saving")
+    def statusParsing(self):
+        self.statusText.setText("Parsing")
+    def statusWriting(self):
+        self.statusText.setText("Writing")
+    def statusRunning(self):
+        self.statusText.setText("Running")
+    def statusStopping(self):
+        self.statusText.setText("Stopping")
+    def statusCommand(self):
+        self.statusText.setText("Command")
+    def statusBuilding(self):
+        self.statusText.setText("Building")
+    def statusInstalling(self):
+        self.statusText.setText("Installing")
+    def statusCleaning(self):
+        self.statusText.setText("Cleaning")
+    def statusCreating(self):
+        self.statusText.setText("Creating")
-    def updatePBar(self, val):
+    def progressStart(self):
+        self.progress == True
+        self.temp == True
+        if(self.progressbar.isHidden()):
+            self.progressbar.show()
+        if(self.stopButton.isHidden()):
+            self.stopButton.show()
+        self.progressbar.setValue(1)
+    def progressStop(self):
+        self.progress == False
+        self.temp == False
-         self.progressbar.setValue(val)
+        self.progressbar.setValue(100)
+        if not(self.progressbar.isHidden()):
+            self.progressbar.hide()
+        if not(self.stopButton.isHidden()):
+            self.stopButton.hide()
+    def progressUpdate(self):
+        if(self.progress == True):
+            if(self.temp == True):
+                self.counter += 1
+                self.progressbar.setValue(self.counter)
+                if(self.counter == 100):
+                    self.temp = False
+            if(self.temp == False):
+                self.counter -= 1
+                self.progressbar.setValue(self.counter)
+                if(self.counter == 0):
+                    self.temp = True
 #-----------------------------------------------------------------------------------#
 #   Editor Functions                                                                #
@@ -432,25 +513,53 @@ class Window(QMainWindow):
         edt.setLine(error.line)
     '''Font Functions'''
     def zoomin(self):
+        pass
-        for i in range(len(self.files)):
+        #for i in range(len(self.files)):
-            self.tabWidget.widget(i).zoomin()
+        #    self.tabWidget.widget(i).zoomin()
     def zoomout(self):
+        pass
-        for i in range(len(self.files)):
+        #for i in range(len(self.files)):
-            self.tabWidget.widget(i).zoomout()
+        #    self.tabWidget.widget(i).zoomout()
-    def setFont(self):
-        font = QFont()
-        font.setFamily(config.fontName())
-        fdialog = QFontDialog(self)
-        fdialog.show()
-        fdialog.setCurrentFont(font)
-        fdialog.accepted.connect(lambda:self.setFontName(fdialog.currentFont()))
-    def setFontName(self,font):
+    def setFontName(self,idx):
-        #print "accepted"
-        #print font.family()
-        fontName = str(font.family())
+        fontName = str(self.toolBar.fontCombo.itemText(idx))
         config.setFontName(fontName)
         for i in range(len(self.files)):
-            self.tabWidget.widget(i).setFontName(fontName)
+            self.tabWidget.widget(i).setFontName()
+    def setFontSize(self,idx):
+        fontSize = idx+1
+        config.setFontSize(fontSize)
+        for i in range(len(self.files)):
+            self.tabWidget.widget(i).setFontSize()
+    def gotoLine(self,item):
+        edt = self.tabWidget.widget(self.tabWidget.currentIndex())
+        edt.setLine(item.line)
+    def setMargin(self):
+        mar = config.margin()
+        if(mar == 0):
+            config.setMargin(1)
+            for i in range(len(self.files)):
+                self.tabWidget.widget(i).setMargin(1)
+        else:
+            config.setMargin(0)
+            for i in range(len(self.files)):
+                self.tabWidget.widget(i).setMargin(0)
+    def setIndent(self):
+        indent = config.indent()
+        if(indent == 0):
+            config.setIndent(1)
+            for i in range(len(self.files)):
+                self.tabWidget.widget(i).setIndent(1)
+        else:
+            config.setIndent(0)
+            for i in range(len(self.files)):
+                self.tabWidget.widget(i).setIndent(0)
     def setThreshold(self,val):
         config.setThresh(val)
         for i in range(len(self.files)):
@@ -490,17 +599,22 @@ class Window(QMainWindow):
 #   Command Functions                                                               #
 #-----------------------------------------------------------------------------------#
     def getFile(self):
-        fname = str(QFileDialog.getOpenFileName(self,"Open File", '.', "Files (*.*)"))
-        if not (fname == ""):
-            index = self.combo2.currentIndex()
-            text = str(self.combo2.itemText(index))+" "+fname
-            self.combo2.setItemText(index,text)
+        self.browsedialog = DialogBrowse(self)
+        self.browsedialog.tree.itemDoubleClicked.connect(self.getName)
-            self.paramList.pop(index)
+        self.browsedialog.show()
-            self.paramList.insert(index,text)
-            config.setParam(self.paramList)
+    def getName(self,item):
+        if(item.isFile()):
+                self.browsedialog.accept()
+                fname = item.getPath()
+                if not (fname == ""):
+                    index = self.combo2.currentIndex()
+                    text = str(self.combo2.itemText(index))+" "+fname
+                    self.combo2.setItemText(index,text)
+                    self.paramList.pop(index)
+                    self.paramList.insert(index,text)
+                    config.setParam(self.paramList)
     def addCmd(self,index):
         text, ok = QInputDialog.getText(self, 'Add Command', 'Command:')
         if(ok):

~repos /sabel-ide

git clone https://pyrossh.dev/repos/sabel-ide.git

sabel-ide