start writing debugmodule

This commit is contained in:
Pavol Rusnak 2011-04-15 00:25:29 +02:00
parent e809984eb2
commit 4b73d98c11
12 changed files with 58 additions and 24 deletions

2
software/.gitignore vendored
View file

@ -1,3 +1,3 @@
*.pyc
mainUi.py
*Ui.py
resources_rc.py

View file

@ -1,10 +1,13 @@
all: edubrm mainUi.py resources_rc.py
all: edubrm mainUi.py resources_rc.py modules/ModuleDebugUi.py
mainUi.py: main.ui
pyuic4 main.ui -o mainUi.py
pyuic4 $< -o $@
resources_rc.py:
pyrcc4 resources.qrc -o resources_rc.py
resources_rc.py: resources.qrc
pyrcc4 $< -o $@
modules/ModuleDebugUi.py: modules/ModuleDebug.ui
pyuic4 $< -o $@
clean:
rm -f *.pyc modules/*.pyc mainUi.py resources_rc.py
rm -f *.pyc *Ui.py modules/*.pyc modules/*Ui.py resources_rc.py

View file

@ -22,7 +22,7 @@ class ModuleButton(QPushButton):
self.form.ui.btnExit.hide()
self.form.ui.btnBack.show()
self.form.ui.lblTitle.setText(self.mod.title)
self.mod.setup(self.form.ui.areaModule)
self.mod.setup(self.form.ui.areaModuleContents)
class Main(QMainWindow):
def __init__(self):

View file

@ -1 +1,2 @@
*.pyc
*Ui.py

View file

@ -2,11 +2,10 @@ from module import Module
class ModuleA(Module):
title = "Acko"
title = 'Acko'
def setup(self, area):
print 'setup A'
print area
def run(self):
print 'run A'

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -1,12 +0,0 @@
from module import Module
class ModuleB(Module):
title = "Bcko"
def setup(self, area):
print 'setup B'
print area
def run(self):
print 'run B'

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

@ -0,0 +1,14 @@
from module import Module
from ModuleDebugUi import Ui_ModuleDebug
class ModuleDebug(Module):
title = 'Debug'
def setup(self, area):
print 'setup Debug'
self.ui = Ui_ModuleDebug()
self.ui.setupUi(area)
def run(self):
print 'run Debug'

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ModuleDebug</class>
<widget class="QWidget" name="ModuleDebug">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>781</width>
<height>531</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QCalendarWidget" name="calendarWidget">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>761</width>
<height>511</height>
</rect>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

View file

@ -1,5 +1,5 @@
from ModuleA import ModuleA
from ModuleB import ModuleB
from ModuleDebug import ModuleDebug
def list():
return [ModuleA(),ModuleB()]
return [ModuleDebug(),ModuleA()]

View file

@ -5,6 +5,6 @@
<file>about.png</file>
<file>icon.png</file>
<file>modules/ModuleA.png</file>
<file>modules/ModuleB.png</file>
<file>modules/ModuleDebug.png</file>
</qresource>
</RCC>