sabel-ide

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

sabel-ide

85028691 — pyros2097

v0.56 Fixed Project bugs added todo list

Files changed (30) hide show

.settings/org.eclipse.core.resources.prefs +2 -0
Widget/Project.ui +0 -195
Widget/__init__.py +5 -3
Widget/__init__.pyc +0 -0
Widget/ant.py +36 -14
Widget/audio.py +128 -0
Widget/command.py +3 -4
Widget/dialogs.py +44 -55
Widget/image.py +20 -0
Widget/lexersquirrel.py +1 -1
Widget/tab.py +115 -12
Widget/tab.pyc +0 -0
Widget/tree.py +79 -35
Widget/tree.pyc +0 -0
build/exe.win32-2.7/PyQt4.phonon.pyd +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.yaml +16 -11
build/exe.win32-2.7/library.zip +0 -0
build/exe.win32-2.7/phonon4.dll +0 -0
build/exe.win32-2.7/phonon_backend/phonon_ds94.dll +0 -0
config.py +23 -78
config.yaml +13 -9
cx.py +1 -2
globals.py +1 -2
icons.py +1 -1
main.py +31 -0
mainwindow.py +67 -87
stylesheet.py +0 -26
window.py +146 -38

.settings/org.eclipse.core.resources.prefs ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ eclipse.preferences.version=1
2	+ encoding//Widget/audio.py=utf-8

Widget/Project.ui DELETED Viewed

@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>580</width>
-    <height>348</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>New Project</string>
-  </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>210</x>
-     <y>300</y>
-     <width>341</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-  </widget>
-  <widget class="QWidget" name="formLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>40</y>
-     <width>521</width>
-     <height>241</height>
-    </rect>
-   </property>
-   <layout class="QFormLayout" name="formLayout">
-    <item row="0" column="0">
-     <widget class="QLabel" name="label">
-      <property name="font">
-       <font>
-        <family>MS Sans Serif</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="text">
-       <string>New Project Name:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_2">
-      <property name="font">
-       <font>
-        <family>MS Sans Serif</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="text">
-       <string>Project Location:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="0">
-     <widget class="QLabel" name="label_3">
-      <property name="font">
-       <font>
-        <family>MS Sans Serif</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="text">
-       <string>Project Description:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="1">
-     <widget class="QLineEdit" name="lineEdit"/>
-    </item>
-    <item row="1" column="1">
-     <widget class="QLineEdit" name="lineEdit_2"/>
-    </item>
-    <item row="2" column="1">
-     <widget class="QTextEdit" name="textEdit"/>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label_4">
-      <property name="font">
-       <font>
-        <family>MS Sans Serif</family>
-        <pointsize>10</pointsize>
-       </font>
-      </property>
-      <property name="text">
-       <string>Project License:</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QComboBox" name="comboBox">
-      <item>
-       <property name="text">
-        <string>Apache License 2.0</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Artistic License/GPL</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Eclipse Plugin License 1.0</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>GNU General Public License v2</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>GNU General Public License v3</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>GNU Lesser General Public License</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>MIT  License</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Mozilla Public License 1.1</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>New BSD License</string>
-       </property>
-      </item>
-      <item>
-       <property name="text">
-        <string>Other</string>
-       </property>
-      </item>
-     </widget>
-    </item>
-   </layout>
-  </widget>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>Dialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>Dialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

Widget/__init__.py CHANGED Viewed

@@ -1,10 +1,12 @@
 from editor import Editor
-from tab import Tab
+from tab import *
-from tree import ProjectTree,ErrorTree,OutlineTree
+from tree import *
 from adb import Adb
 from ant import Ant
 from parser import Parser
 from command import Command
 from ipython import PyInterp
 from style import *
-from dialogs import *
+from dialogs import *
+from audio import Audio
+from image import Image

Widget/__init__.pyc CHANGED Viewed

Binary file

Widget/ant.py CHANGED Viewed

@@ -1,4 +1,4 @@
-from globals import adblist,device
+from globals import adblist,device,ospathjoin
 from PyQt4.QtGui import QWidget
 from PyQt4.QtCore import pyqtSignal,SIGNAL,QThread,QProcess,QString,QTimer
 from workthread import WorkThread
@@ -53,35 +53,57 @@ class Ant(QWidget):
         self.parent.textEdit.append(line)
     def newstart(self,no,cmd):
-        print "finished"
+        self.parent.textEdit.append("Finished")
+        self.parent.textEdit.append(cmd)
+    def showOutput(self):
+        if(self.parent.tabWidget_3.isHidden()):
+            self.parent.tabWidget_3.show()
+            self.parent.tabWidget_3.setCurrentIndex(1)
-    def create(self):
+    def create(self,prj):
         if self.isRunning == False:
             self.isRunning = True
+        self.showOutput()
+        self.parent.textEdit.clear()
-        self.parent.textEdit.append("Building..")
+        self.parent.textEdit.append("Creating... "+prj.getPath())
-        self.adb_thread.setCmd("android update project -p "+prj)
+        self.adb_thread.setCmd("android.bat update project -p "+prj.getPath())
         self.adb_thread.run()
-    def build(self):
+    def build(self,prj):
         if self.isRunning == False:
             self.isRunning = True
+        self.showOutput()
-        self.parent.textEdit.append("Building..")
+        self.parent.textEdit.clear()
+        self.parent.textEdit.append("Ant Building Debug... "+ospathjoin(prj.getPath(),"build.xml"))
-        self.adb_thread.setCmd("ant debug "+prj)
+        self.adb_thread.setCmd("ant.bat debug -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
         self.adb_thread.run()
-    def clean(self):
+    def clean(self,prj):
         if self.isRunning == False:
             self.isRunning = True
+        self.showOutput()
+        self.parent.textEdit.clear()
-        self.parent.textEdit.append("Building..")
+        self.parent.textEdit.append("Ant Cleaning... "+prj.getPath())
-        self.adb_thread.setCmd("ant clean "+prj)
+        self.adb_thread.setCmd("ant.bat clean -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
         self.adb_thread.run()
-    def buildRun(self):
+    def buildRun(self,prj):
         if self.isRunning == False:
             self.isRunning = True
+        self.showOutput()
+        self.parent.textEdit.clear()
+        self.parent.textEdit.append("Ant Building and Installing... "+ospathjoin(prj.getPath(),"build.xml"))
+        self.adb_thread.setCmd("ant.bat debug install -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
+        self.adb_thread.run()
+    def run(self,prj):
+        if self.isRunning == False:
+            self.isRunning = True
+        self.showOutput()
+        self.parent.textEdit.clear()
-        self.parent.textEdit.append("Building..")
+        self.parent.textEdit.append("Installing... "+prj.getPath())
-        self.adb_thread.setCmd("ant debug install "+prj)
+        self.adb_thread.setCmd("ant.bat install -buildfile "+ospathjoin(prj.getPath(),"build.xml"))
         self.adb_thread.run()
     def close(self):

Widget/audio.py ADDED Viewed

@@ -0,0 +1,128 @@
+import sys
+from PyQt4 import QtCore, QtGui
+from PyQt4.phonon import Phonon
+class Audio(QtGui.QDialog):
+    def __init__(self,parent,nfile):
+        QtGui.QDialog.__init__(self,parent)
+        self.resize(300, 250)
+        self.audioOutput = Phonon.AudioOutput(Phonon.MusicCategory, self)
+        self.mediaObject = Phonon.MediaObject(self)
+        self.mediaObject.setTickInterval(1000)
+        self.mediaObject.tick.connect(self.tick)
+        self.mediaObject.stateChanged.connect(self.stateChanged)
+        Phonon.createPath(self.mediaObject, self.audioOutput)
+        self.setupActions()
+        self.setupUi()
+        self.timeLcd.display("00:00")
+        self.finished.connect(self.stop)
+        if nfile == "":
+            return
+        self.mediaObject.enqueue(Phonon.MediaSource(nfile))
+        self.mediaObject.play()
+    def stop(self):
+        #print "stopping"
+        #self.mediaObject.stop()
+        #self.mediaObject.clearQueue()
+        self.mediaObject.deleteLater()
+    def stateChanged(self, newState, oldState):
+        if newState == Phonon.ErrorState:
+            if self.mediaObject.errorType() == Phonon.FatalError:
+                QtGui.QMessageBox.warning(self, "Fatal Error",
+                        self.mediaObject.errorString())
+            else:
+                QtGui.QMessageBox.warning(self, "Error",
+                        self.mediaObject.errorString())
+        elif newState == Phonon.PlayingState:
+            self.playAction.setEnabled(False)
+            self.pauseAction.setEnabled(True)
+            self.stopAction.setEnabled(True)
+        elif newState == Phonon.StoppedState:
+            self.stopAction.setEnabled(False)
+            self.playAction.setEnabled(True)
+            self.pauseAction.setEnabled(False)
+            self.timeLcd.display("00:00")
+        elif newState == Phonon.PausedState:
+            self.pauseAction.setEnabled(False)
+            self.stopAction.setEnabled(True)
+            self.playAction.setEnabled(True)
+    def tick(self, time):
+        displayTime = QtCore.QTime(0, (time / 60000) % 60, (time / 1000) % 60)
+        self.timeLcd.display(displayTime.toString('mm:ss'))
+    def setupActions(self):
+        self.playAction = QtGui.QAction(
+                self.style().standardIcon(QtGui.QStyle.SP_MediaPlay), "Play",
+                self, shortcut="Ctrl+P", enabled=False,
+                triggered=self.mediaObject.play)
+        self.pauseAction = QtGui.QAction(
+                self.style().standardIcon(QtGui.QStyle.SP_MediaPause),
+                "Pause", self, shortcut="Ctrl+A", enabled=False,
+                triggered=self.mediaObject.pause)
+        self.stopAction = QtGui.QAction(
+                self.style().standardIcon(QtGui.QStyle.SP_MediaStop), "Stop",
+                self, shortcut="Ctrl+S", enabled=False,
+                triggered=self.mediaObject.stop)
+    def setupUi(self):
+        bar = QtGui.QToolBar()
+        bar.addAction(self.playAction)
+        bar.addAction(self.pauseAction)
+        bar.addAction(self.stopAction)
+        self.seekSlider = Phonon.SeekSlider(self)
+        self.seekSlider.setMediaObject(self.mediaObject)
+        self.volumeSlider = Phonon.VolumeSlider(self)
+        self.volumeSlider.setAudioOutput(self.audioOutput)
+        self.volumeSlider.setSizePolicy(QtGui.QSizePolicy.Maximum,
+                QtGui.QSizePolicy.Maximum)
+        volumeLabel = QtGui.QLabel()
+        volumeLabel.setPixmap(QtGui.QPixmap('images/volume.png'))
+        palette = QtGui.QPalette()
+        palette.setBrush(QtGui.QPalette.Light, QtCore.Qt.darkGray)
+        self.timeLcd = QtGui.QLCDNumber()
+        #self.timeLcd.setFixedSize(35,35)
+        self.timeLcd.setPalette(palette)
+        seekerLayout = QtGui.QHBoxLayout()
+        seekerLayout.addWidget(self.seekSlider)
+        playbackLayout = QtGui.QHBoxLayout()
+        playbackLayout.addWidget(bar)
+        playbackLayout.addStretch()
+        playbackLayout.addWidget(volumeLabel)
+        playbackLayout.addWidget(self.volumeSlider)
+        mainLayout = QtGui.QVBoxLayout()
+        mainLayout.addLayout(seekerLayout)
+        mainLayout.addLayout(playbackLayout)
+        mainLayout.addWidget(self.timeLcd)
+        widget = QtGui.QWidget()
+        widget.setLayout(mainLayout)
+        self.setLayout(mainLayout)
+        #self.setWindowTitle("Audio Player")
+if __name__ == '__main__':
+    app = QtGui.QApplication(sys.argv)
+    window = Audio()
+    window.show()
+    sys.exit(app.exec_())

Widget/command.py CHANGED Viewed

@@ -21,10 +21,9 @@ class Command(QWidget):
     def setCmdLine(self):
         com = self.parent.combo.itemText(self.parent.combo.currentIndex())
-        self.cmd = str(com+" "+self.parent.runEdit.text())
+        self.cmd = str(com+" "+self.parent.combo2.itemText(self.parent.combo2.currentIndex()))
-        if self.cmd != "":
-            self.parent.textEdit.clear()
+        self.parent.textEdit.clear()
-            self.run()
+        self.run()
     def finished(self,no,cmd):
         if(no == 0):

Widget/dialogs.py CHANGED Viewed

@@ -214,7 +214,7 @@ class DialogAbout(QtGui.QMessageBox):
                  POSSIBILITY OF SUCH DAMAGE.
                 """ % (__version__,PY_VERSION,QtCore.QT_VERSION_STR, QtCore.PYQT_VERSION_STR,OS_NAME)
         self.about(self,"About",text)
 class TodoWidget(QtGui.QWidget):
     def __init__(self,parent,task=None):
         QtGui.QWidget.__init__(self,parent)
@@ -225,8 +225,8 @@ class TodoWidget(QtGui.QWidget):
         self.formLayout.setWidget(0, QtGui.QFormLayout.LabelRole, self.label)
         self.task = QtGui.QLineEdit(self)
         self.formLayout.setWidget(0, QtGui.QFormLayout.FieldRole, self.task)
-        self.done = QtGui.QCheckBox(self)
+        self.ok = QtGui.QPushButton("add",self)
-        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.done)
+        self.formLayout.setWidget(1, QtGui.QFormLayout.FieldRole, self.ok)
         self.label_2 = QtGui.QLabel(self)
         self.formLayout.setWidget(2, QtGui.QFormLayout.LabelRole, self.label_2)
         self.dateTime = QtGui.QDateTimeEdit(self)
@@ -234,53 +234,8 @@ class TodoWidget(QtGui.QWidget):
         self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.dateTime)
         self.verticalLayout.addLayout(self.formLayout)
-        self.label.setBuddy(self.task)
-        self.label_2.setBuddy(self.dateTime)
-        #QtCore.QObject.connect(self.dateTime, QtCore.SIGNAL(("dateTimeChanged(QDateTime)")), self.save)
-        #QtCore.QObject.connect(self.done, QtCore.SIGNAL(("stateChanged(int)")), self.save)
-        #QtCore.QObject.connect(self.task, QtCore.SIGNAL(("textChanged(QString)")), selfsave)
-        #QtCore.QObject.connect(self.tags, QtCore.SIGNAL(("textChanged(QString)")), self.save)
-        self.setTabOrder(self.task, self.done)
-        #self.setWindowTitle("Form")
         self.label.setText("Task:")
-        self.done.setText("Finished")
-        self.label_2.setText("Due Date:")
         self.item=None
-    def edit(self,item):
-        """Takes an item, loads the widget with the item's
-        task contents, shows the widget"""
-        self.item=item
-        self.task.setText(self.item.task.text)
-        self.done.setChecked(self.item.task.done)
-        dt=self.item.task.date
-        if dt:
-            self.dateTime.setDate(QtCore.QDate(dt.year,dt.month,dt.day))
-            self.dateTime.setTime(QtCore.QTime(dt.hour,dt.minute))
-        else:
-            self.dateTime.setDateTime(QtCore.QDateTime())
-        self.show()
-    def save(self):
-        if self.item==None:
-            return
-        # Save date and time in the task
-        d=self.dateTime.date()
-        t=self.dateTime.time()
-        self.item.task.date=datetime(
-            d.year(),
-            d.month(),
-            d.day(),
-            t.hour(),
-            t.minute()
-        )
-        # Save text in the task
-        self.item.task.text=str(self.task.text())
-        # Display the data in the item
-        self.item.setText(0,self.item.task.text)
-        self.item.setText(1,str(self.item.task.date))
 class DialogTodo(QtGui.QDialog):
     def __init__(self,parent = None):
@@ -297,32 +252,66 @@ class DialogTodo(QtGui.QDialog):
         self.list.setUniformRowHeights(True)
         self.list.setAllColumnsShowFocus(True)
         self.list.setSortingEnabled(True)
-        self.list.headerItem().setText(0,"Date")
-        self.list.headerItem().setText(1,"Task")
+        self.list.headerItem().setText(0,"Task")
+        self.list.setColumnCount(1)
+        self.list.setStyleSheet("QTreeWidget::item{height:24px;font-size:20px}");
+        #self.list.headerItem().setText(1,"Date")
         self.editor = TodoWidget(self.horizontalLayoutWidget)
         self.toolBar = QtGui.QToolBar(self)
         self.actionDelete_Task = QtGui.QAction(self)
         self.actionDelete_Task.setIcon(Icons.close_view)
+        self.actionDelete_Task.triggered.connect(self.delItem)
         self.actionNew_Task = QtGui.QAction(self)
         self.actionNew_Task.setIcon(Icons.add)
-        self.actionNew_Task.triggered.connect(self.add)
+        self.actionNew_Task.triggered.connect(self.showAddBar)
         self.actionEdit_Task = QtGui.QAction(self)
-        self.actionEdit_Task.setChecked(False)
-        self.actionEdit_Task.setIcon(Icons.cut_edit)
         self.toolBar.addAction(self.actionNew_Task)
         self.toolBar.addAction(self.actionDelete_Task)
-        self.toolBar.addAction(self.actionEdit_Task)
         self.actionDelete_Task.setShortcut("Del")
         self.horizontalLayout.addWidget(self.toolBar)
         self.horizontalLayout.addWidget(self.list)
         self.horizontalLayout.addWidget(self.editor)
         self.editor.hide()
+        self.editor.ok.clicked.connect(self.enterText)
+        self.taskList = []
+        temp = config.todo()
+        if(temp != None):
+            if(len(temp) != 0):
+                for i in temp:
+                    self.addItem(i)
-    def add(self):
+    def showAddBar(self):
         if(self.editor.isHidden()):
             self.editor.show()
         else:
             self.editor.hide()
+    def enterText(self):
+        text = self.editor.task.text()
+        self.addItem(str(text))
+    def addItem(self,text):
+        if(text != ""):
+            if(self.taskList != None):
+                if(len(self.taskList) != 0):
+                    if(text not in self.taskList):
+                        self.taskList.append(text)
+                        i = QtGui.QTreeWidgetItem(self.list)
+                        i.setText(0,text)
+                        self.list.addTopLevelItem(i)
+                        config.setTodo(self.taskList)
+                else:
+                    self.taskList.append(text)
+                    i = QtGui.QTreeWidgetItem(self.list)
+                    i.setText(0,text)
+                    self.list.addTopLevelItem(i)
+                    config.setTodo(self.taskList)
+    def delItem(self):
+        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/image.py ADDED Viewed

@@ -0,0 +1,20 @@
+from PyQt4.QtGui import  QColor,QPalette,QLabel,QDialog,QPixmap,QScrollArea,QVBoxLayout
+class Image(QDialog):
+    def __init__(self,parent,nfile):
+        QDialog.__init__(self,parent)
+        tab = QLabel()
+        pal = QPalette(self.palette())
+        bgcolor = QColor("#ffffff")
+        pal.setColor(QPalette.Background,bgcolor)
+        tab.setPalette(pal)
+        if nfile == "":
+            return
+        pix = QPixmap(nfile)
+        tab.setPixmap(pix)
+        scrollArea = QScrollArea()
+        scrollArea.setWidget(tab)
+        mainLayout = QVBoxLayout()
+        mainLayout.addWidget(scrollArea)
+        self.setLayout(mainLayout)
+        self.resize(pix.width()+25, pix.height()+25)

Widget/lexersquirrel.py CHANGED Viewed

@@ -67,7 +67,7 @@ class LexerSquirrel(QsciLexerPython):
           QsciStyle(2, QString("number"), QColor("#008000"), self.colorStyle.paper, self.boldFont, 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("#000000"), self.colorStyle.paper, self.boldFont, True),
+          QsciStyle(5, QString("Keyword"), QColor("#00003f"), 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),

Widget/tab.py CHANGED Viewed

@@ -1,11 +1,10 @@
 from PyQt4.QtGui import (QTabWidget, QMenu, QDrag, QApplication,
-                                QTabBar, QShortcut, QKeySequence, QWidget,
+                        QTabBar, QShortcut, QKeySequence, QWidget,
+                        QHBoxLayout, QLabel, QPixmap, QScrollArea,
-                                QHBoxLayout)
+                        QPalette, QColor)
 from PyQt4.QtCore import SIGNAL, Qt, QPoint, QMimeData, QByteArray
-from PyQt4 import QtGui
-from PyQt4 import QtCore
-#from globals import ossep
+from globals import ossep,ospathbasename,Icons
 class MyTabBar(QTabBar):
     """Tabs base class with drag and drop support"""
@@ -21,23 +20,23 @@ class MyTabBar(QTabBar):
     def dragMoveEvent(self, event):
         if event.mimeData().hasUrls:
-            event.setDropAction(QtCore.Qt.CopyAction)
+            event.setDropAction(Qt.CopyAction)
             event.accept()
         else:
             event.ignore()
     def dropEvent(self, event):
         if event.mimeData().hasUrls:
-            event.setDropAction(QtCore.Qt.CopyAction)
+            event.setDropAction(Qt.CopyAction)
             event.accept()
             links = []
             for url in event.mimeData().urls():
                 links.append(str(url.toLocalFile()))
-            self.emit(QtCore.SIGNAL("dropped"), links)
+            self.emit(SIGNAL("dropped"), links)
         else:
             event.ignore()
-class Tab(QTabWidget):
+class EditorTab(QTabWidget):
     def __init__(self,parent):
         QTabWidget.__init__(self,parent)
         self.setTabBar(MyTabBar(self))
@@ -52,19 +51,123 @@ class Tab(QTabWidget):
     def dragMoveEvent(self, event):
         if event.mimeData().hasUrls:
-            event.setDropAction(QtCore.Qt.CopyAction)
+            event.setDropAction(Qt.CopyAction)
             event.accept()
         else:
             event.ignore()
     def dropEvent(self, event):
         if event.mimeData().hasUrls:
-            event.setDropAction(QtCore.Qt.CopyAction)
+            event.setDropAction(Qt.CopyAction)
             event.accept()
             links = []
             for url in event.mimeData().urls():
                 links.append(str(url.toLocalFile()))
-            self.emit(QtCore.SIGNAL("dropped"), links)
+            self.emit(SIGNAL("dropped"), links)
+        else:
+            event.ignore()
+    def addItem(self,l):
+        self.emit(SIGNAL("dropped"),l)
+class TreeTab(QTabWidget):
+    def __init__(self,parent):
+        QTabWidget.__init__(self,parent)
+        self.setTabBar(MyTabBar(self))
+        self.setAcceptDrops(True)
+        self.connect(self.tabBar(), SIGNAL("dropped"), self.addItem)
+    def dragEnterEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.accept()
+        else:
+            event.ignore()
+    def dragMoveEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.setDropAction(Qt.CopyAction)
+            event.accept()
+        else:
+            event.ignore()
+    def dropEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.setDropAction(Qt.CopyAction)
+            event.accept()
+            links = []
+            for url in event.mimeData().urls():
+                links.append(str(url.toLocalFile()))
+            self.emit(SIGNAL("dropped"), links)
+        else:
+            event.ignore()
+    def addItem(self,l):
+        self.emit(SIGNAL("dropped"),l)
+class OutputTab(QTabWidget):
+    def __init__(self,parent):
+        QTabWidget.__init__(self,parent)
+        #self.setTabBar(MyTabBar(self))
+class Tiler(QTabWidget):
+    Count = 0
+    def __init__(self,parent):
+        QTabWidget.__init__(self,parent)
+        self.tabCloseRequested.connect(self.closeTab)
+        self.setAcceptDrops(True)
+        #self.connect(self.tabBar(), SIGNAL("dropped"), self.addItem)
+    def addImage(self,nfile):
+        #widgetLayout = QHBoxLayout()
+        tab = QLabel()
+        pal = QPalette(self.palette())
+        pal.setColor(QPalette.Background,QColor("#ffffff"))
+        tab.setPalette(pal)
+        tab.setPixmap(QPixmap(nfile))
+        #widgetLayout.addWidget(tab)
+        #widget.setLayout(widgetLayout)
+        scrollArea = QScrollArea()
+        scrollArea.setWidget(tab)
+        #dialogLayout = QVBoxLayout()
+        #dialogLayout.addWidget(scrollArea)
+        #self.setLayout(dialogLayout)
+        self.addTab(scrollArea, ospathbasename(nfile))
+        self.setCurrentIndex(self.Count)
+        self.Count+=1
+    def closeTab(self,index):
+        self.removeTab(index)
+        self.Count-=1
+    def hideTiler(self):
+        self.tiler.setCurrentIndex(0)
+        self.tiler.hide()
+        #if(self.currentIndex() == self.indexOf(self.cornerWidget())):
+        #    return True
+    def dragEnterEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.accept()
+        else:
+            event.ignore()
+    def dragMoveEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.setDropAction(Qt.CopyAction)
+            event.accept()
+        else:
+            event.ignore()
+    def dropEvent(self, event):
+        if event.mimeData().hasUrls:
+            event.setDropAction(Qt.CopyAction)
+            event.accept()
+            links = []
+            for url in event.mimeData().urls():
+                links.append(str(url.toLocalFile()))
+            self.emit(SIGNAL("dropped"), links)
         else:
             event.ignore()

Widget/tab.pyc CHANGED Viewed

Binary file

Widget/tree.py CHANGED Viewed

@@ -1,5 +1,6 @@
 from PyQt4.QtGui import (QTreeWidgetItem,QTreeWidget,QMessageBox,
-                         QIcon,QDrag,QMenu,QAction,QInputDialog,QCursor,QToolBar)
+                         QIcon,QDrag,QMenu,QAction,QInputDialog,QCursor,QToolBar,
+                         QHeaderView,QFileDialog)
 from PyQt4.QtCore import SIGNAL,Qt,QMimeData,QUrl,QPoint
 from globals import (oslistdir,ospathisdir,ospathsep,ospathjoin,ospathexists,
                      ospathbasename,os_icon,osremove,osrename,ospathdirname,
@@ -11,7 +12,7 @@ class Dir(QTreeWidgetItem):
         QTreeWidgetItem.__init__(self,parent)
         self.path = ospathjoin(path,name)
         self.setText (0, name)
-        self.setIcon(0,Icons.package)
+        self.setIcon(0,Icons.foldej)
     def getPath(self):
         return self.path
@@ -30,28 +31,30 @@ class File(QTreeWidgetItem):
         self.setText (0, name)
         self.doc = False
         self.pic = False
+        self.audio = False
         #mime = QMimeData()
         #mime.setUrls([QUrl.fromLocalFile(self.path)])
         #print self.path+":"+str(mime.hasUrls())
+        self.setIcon(0,Icons.file_obj)
         self.Doc(name)
         self.Pic(name)
-        if not (self.doc and self.pic):
-            self.setIcon(0,Icons.file_obj)
+        self.Audio(name)
     def Doc(self,name):
         for e in self.ext:
             if name.endswith(e):
                 self.setIcon(0,Icons.file_obj)
                 self.doc = True
-        #if(name.endswith(".txt") or name.endswith(".nut") or name.endswith(".py")):
-        #    self.setIcon(0,os_icon("file_obj"))
-        #    self.doc = True
     def Pic(self,name):
         if(name.endswith(".png") or name.endswith(".gif") or name.endswith(".jpg")):
-            self.setIcon(0,Icons.file_obj)
+            self.setIcon(0,Icons.image)
             self.pic = True
+    def Audio(self,name):
+        if(name.endswith(".wav") or name.endswith(".mp3") or name.endswith(".ogg")):
+            self.setIcon(0,Icons.image)
+            self.audio = True
     def getPath(self):
         return self.path
@@ -65,6 +68,8 @@ class File(QTreeWidgetItem):
         return self.doc
     def isPic(self):
         return self.pic
+    def isAudio(self):
+        return self.audio
 class Project(QTreeWidgetItem):
     Count = -1
@@ -107,7 +112,15 @@ class ProjectTree(QTreeWidget):
         self.connect(self, SIGNAL("dropped"), self.addItem)
         self.projects = []
         self.closed = config.closedProjects()
+        if(self.closed == None):
-        #print self.closed[0]
+            self.closed = []
+        self.header().setStretchLastSection(False)
+        self.header().setResizeMode(QHeaderView.ResizeToContents)
+        #self.setColumnWidth(0,280)
+    def initProjects(self):
+        for pro in config.projects():
+            self.createProject(pro)
     def readDir(self,parent,path):
         for d in oslistdir(path):
@@ -138,21 +151,46 @@ class ProjectTree(QTreeWidget):
             if not ospathisdir(ospathjoin(path,f)):
                 if not ospathjoin(f).startswith('.'):
                         File(parent,f,path)
+    def newProject(self):
+        fname = str(QFileDialog.getExistingDirectory(self,"Open Project Folder"))
+        if not (fname == ""):
+            fname = fname+"/"
+            if len(self.projects) != 0:
+                if(fname in self.projects):
+                    QMessageBox.about(self, "Already Open","Project Already Open\n"+fname)
+                else:
+                    self.createProject(fname)
+            else:
+                self.createProject(fname)
+    #Important all projects must go through this
+    def createProject(self,startDir):
+        if(ospathexists(startDir)):
+            self.projects.append(startDir)
+            self.addProject(startDir)
+            config.setProject(self.projects)
+            #print "adding"+startDir
+        else:
+            #print "removing"+startDir
+            self.projects.remove(startDir)
+            config.setProject(self.projects)
+            QMessageBox.about(self,"Can't Open Project","Project Does Not Exist %s"%startDir)
     def addProject(self,startDir):
-        if(ospathexists(startDir)):
+        if(len(self.closed) == len(self.projects)):
-            self.projects.append(startDir)
+            self.closed.append(0)
-            if(self.closed[self.projects.index(startDir)] == 0):
+        if(self.closed[self.projects.index(startDir)] == 0):
-                i = Project(self,startDir)
+            i = Project(self,startDir)
-                self.addTopLevelItem(i)
+            self.addTopLevelItem(i)
-                self.readDir(i,startDir)
+            self.readDir(i,startDir)
-                self.readMainFiles(i,startDir)
+            self.readMainFiles(i,startDir)
-            else:
-                i = Project(self,startDir,True)
-                self.addTopLevelItem(i)
         else:
-            QMessageBox.about(self,"Can't Close Project","Project Does Not Exist %s"%startDir)
+            i = Project(self,startDir,True)
+            self.addTopLevelItem(i)
     def addClosedProject(self,startDir):
         if(ospathexists(startDir)):
@@ -162,6 +200,16 @@ class ProjectTree(QTreeWidget):
             config.setClosedProjects(self.closed)
         else:
             QMessageBox.about(self,"Can't Close Project","Project Does Not Exist %s"%startDir)
+    def removeProject(self,item):
+        itemPath = item.getPath()
+        self.closed.pop(self.projects.index(itemPath))
+        config.setClosedProjects(self.closed)
+        self.projects.remove(itemPath)
+        config.setProject(self.projects)
+        self.takeTopLevelItem(self.indexOfTopLevelItem(item))
     def addItem(self,links):
         print links
@@ -249,13 +297,14 @@ 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.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.triggered.connect(lambda:self.buildRun(item))
         action_CleanProject = QAction('Clean', self)
-        action_CleanProject.triggered.connect(lambda:self.buildRun(item))
+        action_CleanProject.triggered.connect(lambda:self.clean(item))
         action_RunProject = QAction('Run', self)
         action_RunProject.triggered.connect(lambda:self.run(item))
         if(item.isProject()):
@@ -263,6 +312,7 @@ class ProjectTree(QTreeWidget):
                 menu.addAction(action_Folder)
                 menu.addAction(action_File)
                 menu.addSeparator()
+                menu.addAction(action_CreateProject)
                 menu.addAction(action_BuildProject)
                 menu.addAction(action_BuildRunProject)
                 menu.addAction(action_RunProject)
@@ -331,14 +381,6 @@ class ProjectTree(QTreeWidget):
                 print ind+pro
                 self.addProject(pro)
-    def removeProject(self,item):
-        itemPath = item.getPath()
-        self.closed.pop(self.projects.index(itemPath))
-        config.setClosedProjects(self.closed)
-        self.projects.remove(itemPath)
-        config.removeProject(itemPath)
-        self.takeTopLevelItem(self.indexOfTopLevelItem(item))
     def newFolder(self,item):
         text,ok = QInputDialog.getText(self,"QInputDialog::getText()","Name:")
@@ -380,14 +422,16 @@ class ProjectTree(QTreeWidget):
     def pasteDir(self,item):
         pass
+    def create(self,item):
+        self.emit(SIGNAL("create"),item)
     def build(self,item):
-        print item.getPath()
+        self.emit(SIGNAL("build"),item)
     def buildRun(self,item):
-        print item.getPath()
+        self.emit(SIGNAL("buildRun"),item)
     def clean(self,item):
-        print item.getPath()
+        self.emit(SIGNAL("clean"),item)
     def run(self,item):
-        pass
+        self.emit(SIGNAL("run"),item)
     def renameProject(self,item):
         itempath = item.getPath()

Widget/tree.pyc CHANGED Viewed

Binary file

build/exe.win32-2.7/PyQt4.phonon.pyd ADDED 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.yaml CHANGED Viewed

@@ -1,5 +1,5 @@
 ADB:
-- C:/CODE/main.nut /sdcard/
+- C:/CODE/sabel.png /sdcard/
 - com.emo_framework.examples/com.emo_framework.EmoActivity
 - EmoFramework
 - com.emo_framework.examples
@@ -7,30 +7,35 @@ ANT:
 - android update project --target 5 --path .
 - ant debug install
 CMD:
-- ADD
 - GCC
 - CMD
 - PYTHON
 - ADB
 - G++
 - Make
-- Sq
+- SQ
+- JAVA
+ClosedProject:
+- 0
+- 0
 File:
-- C:/CODE/assets/common.nut
+- C:/CODE/datad/runtime.nut
-- C:/CODE/assets/creditscene.nut
-- C:/CODE/assets/logoscene.nut
+PARAM:
-- C:/PaintOnAPanel.py
+- dude
 Project:
-- C:/CODE/data/
+- C:/CODE/datad/
-- C:/CODE/assets/
-Recent:
+Recent: []
-- C:\CODE\main.nut
 Setting:
   device: 1
   fontname: Courier New
   fontsize: 10
   iconsize: 16
+  mode: 0
   styleindex: 8
+  tabwidth: 4
   thresh: 2
   workspace: C:/CODE/
 Style: 0
+TODO:
+- Remove Headers
+- Rewrite code

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

Binary file

build/exe.win32-2.7/phonon4.dll ADDED Viewed

Binary file

build/exe.win32-2.7/phonon_backend/phonon_ds94.dll ADDED Viewed

Binary file

config.py CHANGED Viewed

@@ -54,6 +54,9 @@ class Config:
     def projects(self):
         return self.read('Project')
+    def setProject(self,pros):
+        self.data['Project'] = pros
+        self.write()
     def closedProjects(self):
         return self.read('ClosedProject')
@@ -66,28 +69,28 @@ class Config:
     def files(self):
         return self.read('File')
-    def setfiles(self,files):
+    def setFile(self,files):
         self.data['File'] = files
-    def setProjects(self,pros):
+        self.write()
-        self.data['Project'] = pros
     def adb(self):
         return self.read('ADB')
     def setAdb(self,val):
-        self.data['ADB'][0] = val[0]
+        self.data['ADB'] = val
-        self.data['ADB'][1] = val[1]
-        self.data['ADB'][2] = val[2]
-        self.data['ADB'][3] = val[3]
         self.write()
-    def cmd(self):
+    def cmds(self):
         return self.read('CMD')
     def setCmd(self,val):
-        for i in range(0,len(val)):
-            self.data['CMD'][i] = val[i]
+        self.data['CMD'] = val
+        self.write()
+    def params(self):
+        return self.read('PARAM')
+    def setParam(self,val):
+        self.data['PARAM'] = val
         self.write()
@@ -97,73 +100,15 @@ class Config:
         return self.readSetting('styleindex')
     def setstyleIndex(self,value):
         self.writeSetting("styleindex",value)
+    def todo(self):
+        return self.read('TODO')
+    def setTodo(self,val):
+        self.data['TODO'] = val
+        self.write()
     def write(self):
         try:
             yaml.dump(self.data,open(self.configfile,'w'),default_flow_style=False)
         except:
-            QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)
+            QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)
-    def check(self,data,nfile):
-        #Python store reference to list so this points back to data
-        #so awesome and weird
-        #Must implement to add data not to rewrite data sad
-        if data != None:
-            for i in data:
-                if(i == nfile):
-                    return False
-        return True
-    def addFile(self,nfile):
-        files = self.files()
-        if(files == None):
-            files = []
-        if(self.check(files,nfile)):
-            if(os.path.exists(nfile)):
-                files.append(nfile)
-                self.setfiles(files)
-                try:
-                    yaml.dump(self.data,open(self.configfile,'w'),default_flow_style=False)
-                except:
-                    QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)
-            else:
-                QMessageBox.about(self,"Can't Open","File Does not Exist\n")
-        else:
-            #print "File is Already Saved" #need to fix this
-            pass
-    def removeFile(self,nfile):
-        files = self.files()
-        if not (self.check(files,nfile)):
-            files.remove(nfile)
-            try:
-                yaml.dump(self.data,open(self.configfile,'w'),default_flow_style=False)
-            except:
-                QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)
-    def addProject(self,nfile):
-        pros = self.projects()
-        if pros == None:
-            pros = []
-        if(self.check(pros,nfile)):
-            if(os.path.exists(nfile)):
-                pros.append(nfile)
-                self.setProjects(pros)
-                try:
-                    yaml.dump(self.data,open(self.configfile,'w'),default_flow_style=False)
-                except:
-                    QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)
-            else:
-                QMessageBox.about(self,"Can't Open","Folder Does not Exist\n")
-        else:
-            pass
-    def removeProject(self,nfile):
-        pros = self.projects()
-        if not(self.check(pros,nfile)):
-            pros.remove(nfile)
-            try:
-                yaml.dump(self.data,open(self.configfile,'w'),default_flow_style=False)
-            except:
-                QMessageBox.about(self,"Can't Open","cannot open config file\n"+self.configfile)

config.yaml CHANGED Viewed

@@ -18,15 +18,18 @@ CMD:
 ClosedProject:
 - 0
 - 0
+- 0
 File:
-- C:/CODE/assets/creditscene.nut
+- C:/CODE/assetsd/creditscene.nut
+- C:/CODE/assetsd/common.nut
+- C:/CODE/assetsd/common.nut
-- C:/CODE/assets/howtoscene.nut
+- C:/CODE/assetsd/howtoscene.nut
+PARAM:
-- C:/CODE/data/runtime.nut
+- hh C:/CODE/152940-ios.jpeg
 Project:
-- C:/CODE/data/
+- C:/CODE/datad/
-- C:/CODE/assets/
+- C:/CODE/assetsd/
-Recent:
+Recent: []
-- C:\CODE\main.nut
 Setting:
   device: 1
   fontname: Courier New
@@ -39,5 +42,6 @@ Setting:
   workspace: C:/CODE/
 Style: 0
 TODO:
+- Fix Closed Projects Bug
+- Add Build Options
-- Remove Headers
+- Add OS support
-- Rewrite code

cx.py CHANGED Viewed

@@ -1,5 +1,4 @@
 from cx_Freeze import setup, Executable
-from globals import __version__
 #excludes = ['curses', 'email', 'tcl','tk','Tkinter','Tkconstants','pywin.debugger']
 """
 excludes = ['_gtkagg', '_tkagg', 'bsddb', 'curses', 'email', 'pywin.debugger',
@@ -22,7 +21,7 @@ exe = Executable(
 setup(
     name = "Sabel",
-    version = __version__,
+    version ="0.56",
     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.55"
+__version__ = "0.56"
 #Python accesses local variables much more efficiently than global variables.
 oslistdir = os.listdir
 ospathisdir = os.path.isdir
@@ -47,7 +47,6 @@ fontName = config.fontName()
 iconSize = config.iconSize()
 adblist = config.adb()
 device = config.device()
-cmds = config.cmd()
 def os_icon(name):
         return QIcon(":/{0}.png".format(ospathjoin(iconDir,name)))

icons.py CHANGED Viewed

@@ -2,7 +2,7 @@
 # Resource object code
 #
-# Created: Sat Sep 1 19:02:40 2012
+# Created: Sun Sep 2 19:45:35 2012
 #      by: The Resource Compiler for PyQt (Qt v4.8.2)
 #
 # WARNING! All changes made in this file will be lost!

main.py ADDED Viewed

@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+__author__ = "pyros2097"
+__license__ = "GPLv3"
+__copyright__ = 'Copyright (c) 2012, pyros2097'
+__credits__ = ['pyros2097', 'eclipse']
+__email__ = 'pyros2097@gmail.com'
+__version__ = "0.56"
+#TODO:
+#Must learn to destroy editor completely because memory keeps increasing
+#when close tab occurs
+from PyQt4.QtGui import QApplication,QSplashScreen
+from PyQt4.QtCore import Qt
+import icons
+app = QApplication([])
+from globals import splash_pix
+from mainwindow import MainWindow
+def main():
+    splash = QSplashScreen(splash_pix, Qt.WindowStaysOnTopHint)
+    splash.setMask(splash_pix.mask())
+    splash.show()
+    app.processEvents()
+    frame = MainWindow()
+    frame.showMaximized()
+    splash.finish(frame)
+    frame.init()
+    app.exec_()
+if __name__ == "__main__":
+    main()

mainwindow.py CHANGED Viewed

@@ -2,7 +2,7 @@ from PyQt4.QtGui import (QApplication,QPixmap,QSplashScreen,QMessageBox,
                          QIcon,QAction,QCheckBox,QFileDialog)
 from PyQt4.QtCore import SIGNAL,Qt,QStringList,QString
 from window import Window
-from Widget import Editor,PyInterp,Adb,Ant,Parser,Command
+from Widget import Editor,PyInterp,Adb,Ant,Parser,Command,Audio,Image
 from globals import (ospathsep,ospathjoin,ospathbasename,workDir,config,workSpace,
                      iconSize,iconDir,ospathexists,os_icon)
 import sys
@@ -12,7 +12,6 @@ class MainWindow(Window):
         Window.__init__(self,parent)
 	#Important must be empty this is a reference
         self.files = []
-        self.projects = None
         self.recent = None
         self.dirty = None
         self.isFull = False
@@ -20,46 +19,38 @@ class MainWindow(Window):
         self.parser = Parser(self)
         self.command = Command(self)
         self.ant = Ant(self)
-        self.init()
     def init(self):
-        self.initConfig()
         self.initToolBar()
-        self.initProjects()
+        self.initConfig()
+        self.treeWidget.initProjects()
         self.connect(self, SIGNAL('triggered()'), self.closeEvent)
         self.connect(self.tabWidget,SIGNAL("dropped"), self.createTabs)
+        self.tabWidget.tabCloseRequested.connect(self.closeTab)
+        self.treeWidget.itemDoubleClicked.connect(self.treeItemClicked)
+        self.connect(self.treeWidget,SIGNAL("create"), lambda x:self.ant.create(x))
+        self.connect(self.treeWidget,SIGNAL("build"), lambda x:self.ant.build(x))
+        self.connect(self.treeWidget,SIGNAL("buildRun"), lambda x:self.ant.buildRun(x))
+        self.connect(self.treeWidget,SIGNAL("clean"), lambda x:self.ant.clean(x))
+        self.connect(self.treeWidget,SIGNAL("run"), lambda x:self.ant.run(x))
         #self.initInterpreter()
-    def initConfig(self):
+    def initConfig(self):
-        self.projects = config.projects()
         self.recent = config.recent()
         self.dirty = []
         if(config.files() != None):
             for i in config.files():
                 self.createTab(i)
-        self.tabWidget.tabCloseRequested.connect(self.closeTab)
-        self.treeWidget.itemDoubleClicked.connect(self.ss)
-    def initProjects(self):
-        if self.projects != None:
-            if len(self.projects) != 0:
-                for pro in self.projects:
-                    self.createProject(pro)
-    #Important all projects must go through this
-    def createProject(self,startDir):
+    def treeItemClicked(self,item):
-        if(ospathexists(startDir)):
-            self.treeWidget.addProject(startDir)
-        else:
-            config.removeProject(startDir)
-            QMessageBox.about(self,"Can't Open Project","Project Does Not Exist %s"%startDir)
-    def ss(self,item):
         if(item.isFile()):
             if(item.isDoc()):
                 self.createTab(item.getPath())
             elif(item.isPic()):
-                self.createTab(item.getPath())
+                self.openImage(item.getPath())
+            elif(item.isAudio()):
+                self.openAudio(item.getPath())
     def initInterpreter(self):
         self.ipy = PyInterp(self)
@@ -68,47 +59,61 @@ class MainWindow(Window):
     def createTab(self,nfile):
         if(nfile != None):
-            if self.files != None:
+            if(self.files != None):
-                if len(self.files) != 0:
+                if(len(self.files) != 0):
-                    for i in self.files:
+                        if(nfile in self.files):
-                        if(i == nfile):
                             #print "File Already Open\n"+nfile
                             self.tabWidget.setCurrentIndex(self.files.index(nfile))
-                            return
-            if type(nfile) == str:
                 if(ospathexists(nfile)):
-                    text = ""
-                    try:
-                        infile = open(nfile, 'r')
-                        text = infile.read()
-                        infile.close()
-                        config.addFile(nfile)
-                        self.dirty.append(False)
-                        self.files.append(nfile)
+                    self.openEditor(nfile)
-                        #print len(self.files)
-                    except:
-                        config.removeFile(nfile)
-                        QMessageBox.about(self,"Can't Open","File Does Not Exist or Locked\n"+nfile)
-                    tab = Editor(self,text,self.syntax(nfile),self.colorStyle)
-                    self.tabWidget.addTab(tab,ospathbasename(nfile))
-                    tab.textChanged.connect(lambda:self.setDirty(nfile))
-                    if(self.files != None):
-                        if(len(self.files)) != 0:
-                            #This line sets the opened file to display first Important not checked
-                            self.tabWidget.setCurrentIndex(len(self.files)-1)
                 else:
                     #dont know must check this the last file is not removed executes only
-                    #twice when it has to remove 3 files
+                    #1 when it has to remove 2 files
                     #check sel.files
                     #print len(config.files())
+                    print "removing"+nfile
+                    self.files.remove(nfile)
-                    config.removeFile(nfile)
+                    config.setFile(self.files)
-                    QMessageBox.about(self,"Can't Open","File Does Not Exist or Locked\n"+nfile)
+                    QMessageBox.about(self,"Can't Open","File Does Not Exist\n"+nfile)
-    def createTabs(self,link):
+    def createTabs(self,links):
-        for i in link:
+        for i in links:
             self.createTab(i)
+    def openEditor(self,nfile):
+        text = ""
+        try:
+            infile = open(nfile, 'r')
+            text = infile.read()
+            infile.close()
+            self.files.append(nfile)
+            config.setFile(self.files)
+            self.dirty.append(False)
+            #print len(self.files)
+            tab = Editor(self,text,self.syntax(nfile),self.colorStyle)
+            self.tabWidget.addTab(tab,ospathbasename(nfile))
+            tab.textChanged.connect(lambda:self.setDirty(nfile))
+            if(self.files != None):
+                if(len(self.files)) != 0:
+                    #This line sets the opened file to display first Important not checked
+                    self.tabWidget.setCurrentIndex(len(self.files)-1)
+        except:
+            #print "removing"+nfile
+            self.files.remove(nfile)
+            config.setFile(self.files)
+            QMessageBox.about(self,"Can't Open","File is Being Used\n"+nfile)
+    def openImage(self,nfile):
+        form = Image(self,nfile)
+        form.show()
+        #print nfile
+        #self.tiler.addImage(nfile)
+        #self.tiler.show()
+    def openAudio(self,nfile):
+        form = Audio(self,nfile)
+        form.show()
     def closeTab(self,index):
         '''Boolean result invocation method.'''
         done = True
@@ -126,10 +131,9 @@ class MainWindow(Window):
                 done = True
         if(done):
             #print index
-            config.removeFile(self.files[index])
             self.files.remove(self.files[index])
+            config.setFile(self.files)
             self.tabWidget.removeTab(index)
-        #return True
     def setDirty(self,file):
         '''On change of text in textEdit window, set the flag
@@ -147,34 +151,12 @@ class MainWindow(Window):
         flbase = ospathbasename(self.files[index])
         self.tabWidget.setTabText(index,flbase)
-    def newProject(self):
-        fname = str(QFileDialog.getExistingDirectory(self,"Open Project Folder"))
-        if not (fname == ""):
-            fname = fname+"/"
-            #print fname
-            #print self.projects
-            if len(self.projects) != 0:
-                for nfile in self.projects:
-                    if(nfile != fname):
-                        self.createProject(fname)
-                        config.addProject(fname)
-                        return
-                    else:
-                        QMessageBox.about(self, "Already Open","Project Already Open\n"+fname)
-                        return
-            else:
-                self.createProject(fname)
-                config.addProject(fname)
-        return
     def fileOpen(self):
-        fname = str(QFileDialog.getOpenFileName(self,
-                        "Open File", '.', "Files (*.*)"))
+        fname = str(QFileDialog.getOpenFileName(self,"Open File", '.', "Files (*.*)"))
         if not (fname == ""):
             if self.files != None:
                 if len(self.files) != 0:
-                    for file in self.files:
+                        if(fname in self.files):
-                        if(file != fname):
                             self.createTab(fname)
                             return
                         else:
@@ -183,13 +165,10 @@ class MainWindow(Window):
                 else:
                     self.createTab(fname)
             else:
-                print "not"
+                #print "not"
                 #this is when the files list is empty and None type
-                if(self.files == None):
-                    self.files = []
+                self.files = []
                 self.createTab(fname)
-        else:
-            return
     def fileSave(self):
         if(self.files != None):
@@ -234,6 +213,7 @@ class MainWindow(Window):
         self.adb.close()
         self.parser.close()
         self.command.close()
+        self.ant.close()
         notSaved = False
         for files in self.dirty:
             if files == True:

stylesheet.py CHANGED Viewed

@@ -1,29 +1,3 @@
-slisty = """
-         QSlider::groove:horizontal {
-     border: 1px solid #999999;
-     height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
-     background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #B1B1B1, stop:1 #c4c4c4);
-     margin: 2px 0;
- }
- QSlider::handle:horizontal {
-     background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
-     border: 1px solid #5c5c5c;
-     width: 18px;
-     margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
-     border-radius: 3px;
- }
- /*
- QSlider::add-page:horizontal {
-     background: white;
- }
- QSlider::sub-page:horizontal {
-     background: pink;
- }
- */
-"""
 stletabb = """
         /* Style the tab using the tab sub-control. Note that
      it reads QTabBar _not_ QTabWidget */

window.py CHANGED Viewed

@@ -2,16 +2,17 @@ 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,
-                         QFont,QComboBox,QFileDialog,QInputDialog)
+                         QFont,QComboBox,QFileDialog,QInputDialog,QProgressBar)
 from PyQt4.QtCore import QSize,Qt,QStringList
-from Widget import (Tab,ProjectTree,ErrorTree,OutlineTree,DialogAndroid,DialogAbout,
+from Widget import (EditorTab,Tiler,TreeTab,OutputTab,
+                    ProjectTree,ErrorTree,OutlineTree,
-                    DialogAnt,DialogSquirrel,DialogTodo)
+                    DialogAndroid,DialogAbout,DialogAnt,DialogSquirrel,DialogTodo)
 from Widget.style import Styles
 from stylesheet import *
 from globals import (ospathsep,ospathjoin,ospathbasename,workDir,config,workSpace,
                      iconSize,iconDir,adblist,Icons,os_icon,
-                     fontName,fontSize,cmds)
+                     fontName,fontSize)
 class Window(QMainWindow):
     def __init__(self,parent = None):
@@ -24,24 +25,33 @@ class Window(QMainWindow):
         self.horizontalLayout = QHBoxLayout(self.centralwidget)
         self.horizontalLayout.setMargin(0)
         self.styleIndex = config.styleIndex()
-        self.cmdList =cmds
+        self.cmdList = config.cmds()
+        self.paramList = config.params()
         self.mode = config.mode()
         #TabWidgets
+        #This parent is for findbar and vetical layount do not remove
         self.tab_1 = QWidget(self)
         self.tab_1.setMinimumWidth(800)
-        self.tabWidget = Tab(self.tab_1)
+        self.tabWidget = EditorTab(self)
         self.VericalLayout = QVBoxLayout(self.tab_1)
         self.VericalLayout.setMargin(0)
         self.VericalLayout.addWidget(self.tabWidget)
-        self.tabWidget_2 = QTabWidget(self)
+        self.tabWidget_2 = TreeTab(self)
         #self.tabWidget_2.setMaximumWidth(200)
-        self.tabWidget_3 = QTabWidget(self)
+        self.tabWidget_3 = OutputTab(self)
         self.tabWidget_3.setMaximumHeight(200)#260
+        self.tiler = Tiler(self)
+        self.tiler.setMinimumHeight(100)
         self.tabWidget.tabBar().setStyleSheet(stletabb)
+        self.tabWidget_2.currentChanged.connect(self.closeExplorer)
+        self.tabWidget_3.currentChanged.connect(self.closeConsole)
+        self.tabWidget.setTabsClosable(True)
+        self.tabWidget.setTabShape(0)
+        #self.tiler.currentChanged.connect(self.closeDesigner)
+        self.tiler.setTabsClosable(True)
+        self.tiler.setTabShape(0)
         #Tree
         self.tab_5 = QWidget()
@@ -84,7 +94,6 @@ class Window(QMainWindow):
         self.textEdit = QTextEdit()
         self.inputLayout = QHBoxLayout()
         self.inputLayout.setMargin(0)
-        self.runEdit = QLineEdit()
         self.fileButton = QPushButton()
         self.fileButton.setText("File")
         self.fileButton.clicked.connect(self.getFile)
@@ -92,6 +101,7 @@ class Window(QMainWindow):
         self.runButton.setFlat(True)
         self.runButton.setIcon(Icons.go)
         self.combo = QComboBox()
+        self.combo.setFixedWidth(100)
         self.comboAdd = QPushButton()
         self.comboAdd.setIcon(Icons.add)
         self.comboAdd.setFlat(True)
@@ -99,15 +109,36 @@ class Window(QMainWindow):
         self.comboDel = QPushButton()
         self.comboDel.setIcon(Icons.close_view)
         self.comboDel.setFlat(True)
-        #self.comboDel.clicked.connect(self.delCmd)
+        self.comboDel.clicked.connect(self.delCmd)
+        self.combo2 = QComboBox()
+        self.combo2.setFixedWidth(600)
+        self.combo2Add = QPushButton()
+        self.combo2Add.setIcon(Icons.add)
+        self.combo2Add.setFlat(True)
+        self.combo2Add.clicked.connect(self.addParam)
+        self.combo2Del = QPushButton()
+        self.combo2Del.setIcon(Icons.close_view)
+        self.combo2Del.setFlat(True)
+        self.combo2Del.clicked.connect(self.delParam)
+        if(self.checkHasValue(self.cmdList)):
-        for text in self.cmdList:
+            for cmd in self.cmdList:
-            self.combo.addItem(text)
+                self.combo.addItem(cmd)
+        else:
+            self.cmdList = []
+        if(self.checkHasValue(self.paramList)):
+            for param in self.paramList:
+                self.combo2.addItem(param)
+        else:
+            self.paramList = []
         self.horizontalLayout_2.addWidget(self.textEdit)
-        self.inputLayout.addWidget(QLabel("Input:"))
+        self.inputLayout.addWidget(QLabel("Command:"))
         self.inputLayout.addWidget(self.combo)
         self.inputLayout.addWidget(self.comboAdd)
         self.inputLayout.addWidget(self.comboDel)
-        self.inputLayout.addWidget(self.runEdit)
+        self.inputLayout.addWidget(self.combo2)
+        self.inputLayout.addWidget(self.combo2Add)
+        self.inputLayout.addWidget(self.combo2Del)
         self.inputLayout.addWidget(self.fileButton)
         self.inputLayout.addWidget(self.runButton)
         self.horizontalLayout_2.addLayout(self.inputLayout)
@@ -119,6 +150,12 @@ class Window(QMainWindow):
         self.errorTree = ErrorTree(self.tab_7)
         self.horizontalLayout_4.addWidget(self.errorTree)
+        #Tiler
+        #self.tab_11 = QWidget()
+        #self.horizontalLayout_11 = QHBoxLayout(self.tab_11)
+        #self.horizontalLayout_11.setMargin(0)
+        #self.horizontalLayout_11.addWidget(self.tiler)
         #Find
         self.tab_8 = QWidget()
         self.tab_8.setObjectName("tab_8")
@@ -170,26 +207,17 @@ class Window(QMainWindow):
         self.VericalLayout.addWidget(self.tab_8)
         self.tab_8.hide()
-        #Tab Widget Init
+        #Tabwidgets
         self.tabWidget_2.addTab(self.tab_5,"Projects")
         self.tabWidget_2.addTab(self.tab_2,"Outline")
         self.tabWidget_2.addTab(QWidget(self),"")
         self.tabWidget_2.setTabIcon(2,Icons.close_view)
-        self.tabWidget_2.currentChanged.connect(self.closeExplorer)
         self.tabWidget_3.addTab(self.tab_7,"Error")
         self.tabWidget_3.addTab(self.tab_6,"Output")
         self.tabWidget_3.addTab(QWidget(self),"")
         self.tabWidget_3.setTabIcon(0,Icons.error)
         self.tabWidget_3.setTabIcon(1,Icons.console_view)
         self.tabWidget_3.setTabIcon(2,Icons.close_view)
-        self.tabWidget_3.currentChanged.connect(self.closeConsole)
-        self.tabWidget.setTabsClosable(True)
-        self.tabWidget.setTabShape(0)
         #Splitters
         self.split1 = QSplitter(Qt.Horizontal)
@@ -199,6 +227,8 @@ class Window(QMainWindow):
         self.split2 = QSplitter(Qt.Vertical)
         self.split2.addWidget(self.split1)
+        self.split2.addWidget(self.tiler)
+        self.tiler.hide()
         self.split2.addWidget(self.tabWidget_3)
         self.tabWidget_3.hide()
         self.horizontalLayout.addWidget(self.split2)
@@ -210,11 +240,20 @@ class Window(QMainWindow):
         self.aboutButton.setFlat(True)
         self.aboutButton.setIcon(Icons.anchor)
         self.aboutButton.clicked.connect(self.about)
+        self.expButton = QPushButton(self)
+        self.expButton.setFlat(True)
+        self.expButton.setIcon(Icons.prj)
+        self.expButton.clicked.connect(self.exp)
         self.cmdButton = QPushButton(self)
         self.cmdButton.setFlat(True)
         self.cmdButton.setIcon(Icons.console_view)
         self.cmdButton.clicked.connect(self.cmd)
         self.cmdButton.setShortcut('Ctrl+D')
+        self.imgButton = QPushButton(self)
+        self.imgButton.setFlat(True)
+        self.imgButton.setIcon(Icons.color_palette)
+        self.imgButton.clicked.connect(self.design)
+        self.imgButton.setShortcut('Ctrl+I')
         self.findButton = QPushButton(self)
         self.findButton.setFlat(True)
         self.findButton.setIcon(Icons.find)
@@ -232,12 +271,19 @@ class Window(QMainWindow):
         self.fontButton.setFlat(True)
         self.fontButton.setIcon(Icons.font)
         self.fontButton.clicked.connect(self.setFont)
+        self.progressbar = QProgressBar()
+        self.progressbar.setMinimum(0)
+        self.progressbar.setMaximum(100)
         self.statusbar.addWidget(self.aboutButton)
+        self.statusbar.addWidget(self.expButton)
         self.statusbar.addWidget(self.cmdButton)
+        self.statusbar.addWidget(self.imgButton)
         self.statusbar.addWidget(self.findButton)
         self.statusbar.addWidget(self.zoominButton)
         self.statusbar.addWidget(self.zoomoutButton)
         self.statusbar.addWidget(self.fontButton)
+        self.statusbar.addWidget(self.progressbar)
+        self.progressbar.hide()
         #self.statusbar.setFixedHeight(18)
         #Init colorstyling
@@ -252,7 +298,7 @@ class Window(QMainWindow):
     def initToolBar(self):
         self.action_NewProject = QAction(Icons.newprj, 'Project', self)
-        self.action_NewProject.triggered.connect(self.newProject)
+        self.action_NewProject.triggered.connect(self.treeWidget.newProject)
         self.action_NewProject.setToolTip("Create a New Project")
         self.action_Open = QAction(Icons.open, 'Open', self)
@@ -277,12 +323,12 @@ class Window(QMainWindow):
         self.action_Run.triggered.connect(self.adb.run)
         self.action_RunFile = QAction(Icons.go, 'Cmd', self)
         self.action_RunFile.triggered.connect(self.command.setCmd)
-        self.runEdit.returnPressed.connect(self.command.setCmdLine)
         self.runButton.clicked.connect(self.command.setCmdLine)
         self.action_Stop = QAction(Icons.stop, 'Stop', self)
         self.action_Stop.setShortcut('Ctrl+Q')
         self.action_Stop.triggered.connect(self.adb.stop)
         self.action_Design = QAction(Icons.color_palette, 'Design', self)
+        self.action_Design.triggered.connect(self.design)
         self.action_Todo = QAction(Icons.task_set, 'Todo', self)
         self.action_Todo.triggered.connect(self.todo)
@@ -312,12 +358,16 @@ class Window(QMainWindow):
         action_explorer = QAction("Show Explorer",self)
-        action_explorer.triggered.connect(lambda x=2:self.closeExplorer(2))
+        action_explorer.triggered.connect(self.exp)
-        men.addAction(action_explorer)
         action_console = QAction("Show Console",self)
-        action_console.triggered.connect(lambda x=2:self.closeConsole(2))
+        action_console.triggered.connect(self.cmd)
+        action_designer = QAction("Show Designer",self)
+        action_designer.triggered.connect(self.design)
+        action_Indentation = QAction("Indentation Guides",self)
+        men.addAction(action_explorer)
         men.addAction(action_console)
+        men.addAction(action_designer)
-        men.addAction(QAction("Idents",self))
+        men.addAction(action_Indentation)
         men.addSeparator()
         men.addAction(QAction("TabWidth",self))
         men.addAction(self.tabsSliderAction)
@@ -325,7 +375,7 @@ class Window(QMainWindow):
         men.addAction(QAction("Threshold",self))
         men.addAction(self.threshSliderAction)
-        self.action_Options = QAction(Icons.cmpC_pal, 'Options', self)
+        self.action_Options = QAction(Icons.emblem_system, 'Options', self)
         self.action_Options.setMenu(men)
         self.action_Options.triggered.connect(self.options)
@@ -445,7 +495,7 @@ class Window(QMainWindow):
             self.action_Squirrel.setChecked(True)
     def ios(self):
-        print "Nonr"
+        print "ios"
     def sq(self):
@@ -490,6 +540,12 @@ class Window(QMainWindow):
             self.tab_8.show()
         else:
             self.tab_8.hide()
+    def exp(self):
+        if(self.tabWidget_2.isHidden()):
+            self.tabWidget_2.show()
+        else:
+            self.tabWidget_2.hide()
     def cmd(self):
         if(self.tabWidget_3.isHidden()):
@@ -497,6 +553,23 @@ class Window(QMainWindow):
         else:
             self.tabWidget_3.hide()
+    def design(self):
+        if(self.tiler.isHidden()):
+            self.tiler.show()
+        else:
+            self.tiler.hide()
+    def closeDesigner(self,no):
+        pass
+        '''
+        if(no == self.tiler.closeIndex()):
+            if(self.tiler.isHidden()):
+                self.tiler.show()
+            else:
+                self.tiler.setCurrentIndex(1)
+                self.tiler.hide()
+        '''
     def closeConsole(self,no = 2):
         if(no == 2):
             if(self.tabWidget_3.isHidden()):
@@ -512,6 +585,9 @@ class Window(QMainWindow):
                 self.tabWidget_2.setCurrentIndex(0)
                 self.tabWidget_2.hide()
+    def updatePBar(self, val):
+         self.progressbar.setValue(val)
 #-----------------------------------------------------------------------------------#
 #   Editor Functions                                                                #
 #-----------------------------------------------------------------------------------#
@@ -591,7 +667,14 @@ class Window(QMainWindow):
     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.runEdit.setText(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:')
@@ -602,7 +685,32 @@ class Window(QMainWindow):
                 #print self.cmdList
                 self.combo.addItem(cmd)
                 config.setCmd(self.cmdList)
+                config.setParam(self.paramList)
+    def delCmd(self):
+        index = self.combo.currentIndex()
+        self.combo.removeItem(index)
+        self.cmdList.pop(index)
+        #print self.cmdList
+        config.setCmd(self.cmdList)
-    def delCmd(self,index):
+    def addParam(self,index):
+        text, ok = QInputDialog.getText(self, 'Add Parameters', 'Params:')
+        if(ok):
+            if(str(text) != ''):
+                param = str(text)
+                self.paramList.append(param)
+                self.combo2.addItem(param)
+                config.setParam(self.paramList)
+    def delParam(self):
+        index = self.combo2.currentIndex()
+        self.combo2.removeItem(index)
+        self.paramList.pop(index)
+        config.setParam(self.paramList)
+    def checkHasValue(self,list):
+        if(list != None and len(list) != 0):
+            return True
-        pass
+        else:
+            return False

~repos /sabel-ide

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

sabel-ide