6c7d7aa0 pyros2097

13 years ago
saving
Files changed (3) hide show
  1. config.yaml +4 -6
  2. main.py +4 -4
  3. window.py +19 -4
config.yaml CHANGED
@@ -5,14 +5,12 @@ ADB:
5
5
  - adb -d shell ps | grep com.emo_framework.examples | awk '{print $2}' | xargs adb
6
6
  shell kill
7
7
  File:
8
+ - C:/CODE/assets/howtoscene.nut
8
- - C:/CODE/assetsdd/logoscene.nut
9
+ - C:/CODE/assets/logoscene.nut
9
- - C:/CODE/assetsdd/main.nut
10
- - C:/CODE/assetsdd/creditscene.nut
10
+ - C:/CODE/assets/creditscene.nut
11
- - C:/CODE/assetsdd/titlescene.nut
12
- - C:/CODE/assetsdd/Engine.cpp
13
11
  Project:
14
12
  - C:/CODE/data/
15
- - C:/CODE/assetsdd/
13
+ - C:/CODE/assets/
16
14
  Recent:
17
15
  - C:\CODE\main.nut
18
16
  Setting:
main.py CHANGED
@@ -14,13 +14,12 @@ __email__ = 'pyros2097@gmail.com'
14
14
  from PyQt4.QtGui import (QApplication,QPixmap,QSplashScreen,QMessageBox,
15
15
  QIcon,QAction,QCheckBox,QFileDialog)
16
16
  from PyQt4.QtCore import SIGNAL,Qt,QStringList,QString
17
-
18
17
  import icons_rc
19
18
  from window import Window
20
19
  from Widget import Editor,PyInterp,Adb
21
20
  from globals import (ospathsep,ospathjoin,ospathbasename,workDir,
22
21
  OS_NAME,PY_VERSION,os_icon,config,workSpace,
23
- iconSize,iconDir,ospathexists)
22
+ iconSize,iconDir,ospathexists,os_pixmap)
24
23
 
25
24
 
26
25
  class MainWindow(Window):
@@ -258,6 +257,7 @@ class MainWindow(Window):
258
257
  self.fileSaveAll()
259
258
 
260
259
  def syntax(self,nfile):
260
+ lang = 0
261
261
  if nfile.endswith(".py"):
262
262
  lang = 0
263
263
  elif (nfile.endswith(".cpp") or nfile.endswith(".h") or nfile.endswith(".c")):
@@ -275,11 +275,11 @@ class MainWindow(Window):
275
275
 
276
276
  if __name__ == "__main__":
277
277
  app = QApplication([])
278
- splash_pix = QPixmap(':/Icons/logo.gif')
278
+ splash_pix = os_pixmap('logo')
279
279
  splash = QSplashScreen(splash_pix, Qt.WindowStaysOnTopHint)
280
280
  splash.setMask(splash_pix.mask())
281
281
  splash.show()
282
- #app.processEvents()
282
+ app.processEvents()
283
283
  # Simulate something that takes time
284
284
  frame = MainWindow()
285
285
  frame.showMaximized()
window.py CHANGED
@@ -59,6 +59,17 @@ class Window(QMainWindow):
59
59
  self.VerticalLayout_2.addWidget(self.treebar)
60
60
  self.VerticalLayout_2.addWidget(self.treeWidget)
61
61
 
62
+ #Outline
63
+ self.tab_2 = QWidget()
64
+ self.tab_2.setObjectName("tab_2")
65
+ self.tab_2.setMaximumWidth(200)
66
+ self.VerticalLayout_3 = QVBoxLayout(self.tab_2)
67
+ self.VerticalLayout_3.setMargin(0)
68
+ self.VerticalLayout_3.setObjectName("VerticalLayout_3")
69
+ self.outlineWidget = Tree(self.tab_2)
70
+ self.outlineWidget.setObjectName("outlineWidget")
71
+ self.VerticalLayout_3.addWidget(self.outlineWidget)
72
+
62
73
  #Output
63
74
  self.tab_6 = QWidget()
64
75
  self.tab_6.setObjectName("tab_6")
@@ -130,10 +141,13 @@ class Window(QMainWindow):
130
141
 
131
142
 
132
143
  self.tabWidget_2.addTab(self.tab_5,"Projects")
144
+ self.tabWidget_2.addTab(self.tab_2,"Outline")
133
145
  self.tabWidget_3.addTab(self.tab_7,"Error")
134
146
  self.tabWidget_3.addTab(self.tab_6,"Output")
135
147
  self.tabWidget_3.setTabIcon(0,os_icon("message_error"))
136
148
  self.tabWidget_3.setTabIcon(1,os_icon("monitor_obj"))
149
+ self.tabWidget.setTabsClosable(True)
150
+ self.tabWidget.setTabShape(0)
137
151
 
138
152
 
139
153
  #Splitters
@@ -156,22 +170,23 @@ class Window(QMainWindow):
156
170
  self.cmdButton.setIcon(os_icon('monitor_obj'))
157
171
  self.cmdButton.clicked.connect(self.cmd)
158
172
  self.cmdButton.setShortcut('Ctrl+O')
159
- #self.cmdButton.setToolTip("Opens Console Ctrl+O")
160
173
  self.findButton = QPushButton(self)
161
174
  self.findButton.setFlat(True)
162
175
  self.findButton.setIcon(os_icon('find_obj'))
163
176
  self.findButton.setShortcut("Ctrl+F")
164
- #self.findButton.setToolTip("Opens Find Bar Ctrl+F")
165
177
  self.findButton.clicked.connect(self.findBarShow)
178
+ self.aboutButton = QPushButton(self)
179
+ self.aboutButton.setFlat(True)
180
+ self.aboutButton.setIcon(os_icon('find_obj'))
181
+ self.aboutButton.clicked.connect(self.about)
166
182
  self.statusbar.addWidget(self.cmdButton)
167
183
  self.statusbar.addWidget(self.findButton)
184
+ self.statusbar.addWidget(self.aboutButton)
168
185
  self.statusbar.setFixedHeight(18)
169
186
 
170
187
  #Init
171
188
  self.setCentralWidget(self.centralwidget)
172
189
  self.setStatusBar(self.statusbar)
173
- self.tabWidget.setTabsClosable(True)
174
- self.tabWidget.setTabShape(0)
175
190
  #QtGui.QApplication.setStyle(QtGui.QStyleFactory.create('Cleanlooks'))
176
191
 
177
192
  def findBarShow(self):