sabel-ide

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

sabel-ide

cede389e — pyros2097

another save

Files changed (8) hide show

Widget/adb.py +74 -23
Widget/adb.pyc +0 -0
Widget/dialogs.py +16 -1
Widget/editor.py +3 -1
Widget/editor.pyc +0 -0
config.py +17 -7
config.yaml +4 -4
window.py +0 -4

Widget/adb.py CHANGED Viewed

@@ -2,15 +2,17 @@ from globals import adblist
 from PyQt4.QtGui import QWidget
 import threading
 from subprocess import PIPE,Popen,STDOUT
-from PyQt4.QtCore import pyqtSignal,SIGNAL,QThread,QProcess,QString
+from PyQt4.QtCore import pyqtSignal,SIGNAL,QThread,QProcess,QString,QTimer
 class WorkThread(QThread):
     def __init__(self):
         QThread.__init__(self)
         self.process = QProcess()
         self.cmd = None
-        self.connect(self.process, SIGNAL("readyReadStandardOutput()"), self.readOutput)
+        self.process.readyReadStandardOutput.connect(self.readOutput)
-        self.connect(self.process, SIGNAL("readyReadStandardError()"), self.readErrors)
+        self.process.readyReadStandardError.connect(self.readErrors)
+        self.process.finished.connect(self.fini)
     def setCmd(self,val):
         self.cmd = val
@@ -21,14 +23,23 @@ class WorkThread(QThread):
     def run(self):
         #self.process_thread.run()
         self.process.start(self.cmd)
-        #self.exec_()
+        self.exec_()
+        self.process.waitForFinished(-1)
+        self.process.kill()
+        #self.emit(SIGNAL("finished"))
+        #self.setCmd(adblist[1])
+        #self.process.kill()
+        #self.process.start(self.cmd)
-        self.process.waitForFinished()
+        #self.process.waitForFinished()
         #self.emit(SIGNAL("fini"))
         #self.process.finished.connect(self.fini)
         #self.emit(SIGNAL("finished"),True)
+        #return
+    def fini(self,no):
+        self.emit(SIGNAL("fini"),no,self.cmd)
-    def fini(self):
-        self.emit(SIGNAL("fini"))
     def readOutput(self):
         self.emit(SIGNAL("update"),QString(self.process.readAllStandardOutput()))
@@ -36,8 +47,7 @@ class WorkThread(QThread):
         self.emit(SIGNAL("update"),QString(self.process.readAllStandardError()))
     def __del__(self):
-        pass
-        #self.wait()
+        self.wait()
 class AdbThread(threading.Thread,QWidget):
@@ -80,24 +90,67 @@ class Adb(QWidget):
         self.adb_process = None
         self.isRunning = False
         self.adb_thread = WorkThread()
+        self.timer = QTimer()
         #self.adb_thread = AdbThread()
         self.connect(self.adb_thread, SIGNAL("update"),self.update)
         #self.connect(self.adb_thread, SIGNAL("fini"),self.newstart)
-        self.connect(self.adb_thread, SIGNAL("finished"),self.newstart)
+        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 update(self,line):
         self.parent.textEdit.append(line)
-    def newstart(self):
+    def newstart(self,no,cmd):
+        if(cmd == "adb -d push "+adblist[0]):
+            self.parent.textEdit.append(str(no))
-        print "finished"
+            self.parent.textEdit.append(cmd)
-        self.parent.textEdit.append("Finshed")
+            self.parent.textEdit.append("Finshed")
+            self.adb_thread.setCmd("adb -d shell am start -a android.intent.action.MAIN -n "+adblist[1])
+            self.adb_thread.run()
+        elif(cmd == "adb -d push "+adblist[0]):
+            self.parent.textEdit.append(str(no))
+            self.parent.textEdit.append(cmd)
+            self.parent.textEdit.append("Finshed")
+            self.adb_thread.setCmd("adb -d logcat -s "+adblist[2])
+            self.adb_thread.run()
         #self.adb_thread.kill_process()
         #self.parent.textEdit.append("Starting Activity...\n")
         #self.adb_thread.setCmd(adblist[1])
         #self.adb_thread.run()
-        #print "finished"
     def run(self):
         if self.isRunning == False:
             #if self.adb_process != None and self.adb_process.poll() == None:
@@ -110,9 +163,9 @@ class Adb(QWidget):
                 self.parent.tabWidget_3.setCurrentIndex(1)
             self.parent.textEdit.clear()
         self.parent.textEdit.append("Pushing main.nut...\n")
-        self.adb_thread.setCmd(adblist[0])
+        self.adb_thread.setCmd("adb -d push "+adblist[0])
         self.adb_thread.run()
-        #self.adb_thread.finished(self.newstart)
         """
         self.adb_thread.setCmd(adblist[0])
         self.adb_thread.run()
@@ -136,16 +189,14 @@ class Adb(QWidget):
             self.isRunning = False
             self.adb_thread.setCmd(adblist[3])
             self.adb_thread.run()
-            self.adb_thread.join()
-            self.adb_thread.adb_process.kill()
+            self.adb_thread.kill_process()
-            #if self.adb_process != None and self.adb_process.poll() == None:
-            #    self.adb_process.kill()
             self.parent.action_Stop.setDisabled(True)
-            self.parent.textEdit.append("Stopped")
+            self.parent.textEdit.append("Stopped.")
             if not(self.parent.tabWidget_3.isHidden()):
                 self.parent.tabWidget_3.hide()
             self.parent.action_Run.setEnabled(True)
     def close(self):
         if self.adb_process != None and self.adb_process.poll() == None:
+            #self.adb_thread.kill_process()
-            self.adb_process.kill()
+            self.adb_thread.quit()

Widget/adb.pyc CHANGED Viewed

Binary file

Widget/dialogs.py CHANGED Viewed

@@ -1,5 +1,6 @@
 from PyQt4 import QtGui
-from PyQt4 import QtCore
+from PyQt4 import QtCore
+from globals import adblist,config
 """
 class UIProject(QDialog):
     def __init__(self, parentWindow):
@@ -80,7 +81,21 @@ class DialogAndroid(QtGui.QDialog):
         self.label_4.setText("Logcat:")
         self.label_5.setText("Exit Activity:")
         self.tabWidget.setTabText(0,"Android")
+        self.buttonBox.clicked.connect(self.ok)
+        self.lineEdit_2.setText(adblist[0])
+        self.lineEdit_3.setText(adblist[1])
+        self.lineEdit_4.setText(adblist[2])
+        self.lineEdit_5.setText(adblist[3])
+    def ok(self,btn):
+        val = []
+        if(btn.text() == "OK"):
+            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.setAdb(val)
+        self.close()
 class DialogAnt(QtGui.QDialog):
     def __init__(self, parent=None):
         QtGui.QDialog.__init__(self, parent)

Widget/editor.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from globals import fontSize,fontName,ospathjoin,os_pixmap,apiDir,thresHold
+from globals import fontSize,fontName,ospathjoin,os_pixmap,apiDir,thresHold,config
 from PyQt4.QtCore import SIGNAL,QString
 from PyQt4.QtGui import QFontMetrics, QFont, QPixmap, QColor ,QPalette
 from PyQt4.Qsci import QsciScintilla, QsciLexerPython ,QsciAPIs ,QsciLexerCPP
@@ -80,6 +80,7 @@ class Editor(QsciScintilla):
     def zoomin(self):
         self.fontSize += 1
+        config.setFontSize(self.fontSize)
         self.font.setPointSize(self.fontSize)
         #self.setFont(self.font)
         self.lexer.setFont(self.font)
@@ -87,6 +88,7 @@ class Editor(QsciScintilla):
     def zoomout(self):
         self.fontSize -= 1
+        config.setFontSize(self.fontSize)
         self.font.setPointSize(self.fontSize)
         #self.setFont(self.font)
         self.lexer.setFont(self.font)

Widget/editor.pyc CHANGED Viewed

Binary file

config.py CHANGED Viewed

@@ -14,17 +14,23 @@ class Config:
     def writeSetting(self,section,value):
         self.data["Setting"][section] = value
+        self.write()
     def workSpace(self):
         return self.readSetting("workspace")
     def fontSize(self):
         return int(self.readSetting('fontsize'))
+    def setFontSize(self,val):
+        self.writeSetting('fontsize',val)
     def fontName(self):
         return self.readSetting('fontname')
+    def setFontName(self,val):
+        self.writeSetting('fontname',val)
     def iconSize(self):
         return int(self.readSetting('iconsize'))
-    def colorStyle(self):
-        return int(self.readSetting('colorstyle'))
     def projects(self):
         return self.read('Project')
@@ -43,20 +49,24 @@ class Config:
     def adb(self):
         return self.read('ADB')
+    def setAdb(self,val):
+        self.data['ADB'][0] = val[0]
+        self.data['ADB'][1] = val[1]
+        self.data['ADB'][2] = val[2]
+        self.data['ADB'][3] = val[3]
+        self.write()
     def thresh(self):
         return self.readSetting('thresh')
     def setThresh(self,val):
         self.writeSetting('thresh',val)
-        self.write()
+    def colorStyle(self):
+        return int(self.readSetting('colorstyle'))
     def styleIndex(self):
         return self.readSetting('styleindex')
     def setstyleIndex(self,value):
         self.writeSetting("styleindex",value)
-        self.write()
     def write(self):
         try:

config.yaml CHANGED Viewed

@@ -1,14 +1,14 @@
 ADB:
-- adb -d push C:/CODE/main.nut /sdcard/
+- C:/CODE/main.nut /sdcard/
-- adb -d shell am start -a android.intent.action.MAIN -n com.emo_framework.examples/com.emo_framework.EmoActivity
+- com.emo_framework.examples/com.emo_framework.EmoActivity
-- adb -d logcat -s EmoFramework
+- EmoFramework
 - adb -d shell ps | grep com.emo_framework.examples | awk '{print $2}' | xargs adb
   shell kill
 ANT:
 - android update project --target 5 --path .
 - ant debug install
 File:
-- C:/CODE/assets/common.nut
+- C:/CODE/assets/creditscene.nut
 - C:/CODE/assets/main.nut
 Project:
 - C:/CODE/data/

window.py CHANGED Viewed

@@ -393,10 +393,6 @@ class Window(QMainWindow):
     def android(self):
         form = DialogAndroid(self)
-        form.lineEdit_2.setText(adblist[0])
-        form.lineEdit_3.setText(adblist[1])
-        form.lineEdit_4.setText(adblist[2])
-        form.lineEdit_5.setText(adblist[3])
         #form.exec_()
         form.show()

~repos /sabel-ide

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

sabel-ide