Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex <acj3840@rit.edu>2010-06-10 19:40:33 (GMT)
committer Alex <acj3840@rit.edu>2010-06-10 19:40:33 (GMT)
commit1e9f94da41fcc42ed4d23f4b3dd30b9741086c60 (patch)
treec7bfc173f2e41eb0b992553663d6893f663822e2
parent99a5a5037197dedfd7b8e056115c8df1137dc69c (diff)
i promise i've done more, but most of it isnt really working so ill commit that when it is, tomorrow
-rw-r--r--PopQuiz.activity/main.py5
-rw-r--r--PopQuiz.activity/popquiz.py7
-rw-r--r--PopQuiz.activity/popquiz.pycbin0 -> 2668 bytes
3 files changed, 9 insertions, 3 deletions
diff --git a/PopQuiz.activity/main.py b/PopQuiz.activity/main.py
index e06c73b..605224b 100644
--- a/PopQuiz.activity/main.py
+++ b/PopQuiz.activity/main.py
@@ -5,8 +5,7 @@
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-import student
-#import teacher
+import popquiz
@@ -14,7 +13,7 @@ import student
#define main
def main():
global student
- student = student.StudentPopQuiz()
+ student = popquiz.Student()
#if its joining then set self to student
#if its not joining then set self to teacher (by default)
#if it ever starts to join something else, close down teacher set self to student
diff --git a/PopQuiz.activity/popquiz.py b/PopQuiz.activity/popquiz.py
index 588dd99..60bf794 100644
--- a/PopQuiz.activity/popquiz.py
+++ b/PopQuiz.activity/popquiz.py
@@ -21,6 +21,13 @@ class Student:
#Teacher class for GUI and Methods
class Teacher:
+ def __init__(self):
+ #Setting up window
+ screen = pygame.display.set_mode((640,480))
+ pygame.display.set_caption('Teacher Tools: PopQuiz Teacher')
+ # Fill background
+ background = pygame.Surface(screen.get_size())
+ background = background.convert()
#wait for button to be clicked (to send) then call send method
#method to send data
diff --git a/PopQuiz.activity/popquiz.pyc b/PopQuiz.activity/popquiz.pyc
new file mode 100644
index 0000000..8a7a7c8
--- /dev/null
+++ b/PopQuiz.activity/popquiz.pyc
Binary files differ