diff options
| -rw-r--r-- | BlockHeadActivity.py | 26 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/BlockHeadActivity.py b/BlockHeadActivity.py index fed9a94..68c9798 100644 --- a/BlockHeadActivity.py +++ b/BlockHeadActivity.py @@ -23,7 +23,7 @@ with number base <= 10 """ __date__ = '22-Sep-2009' -__version__ = 2081 +__version__ = 2082 # set to True to run as an OLPC/Sugar "activity" # set to False to run as a standard Python program @@ -250,8 +250,9 @@ class AnswerLabel(gtk.EventBox): gtk.EventBox.__init__(self) # add a label that displays its text centered NSEW lab = gtk.Label() - lab.set_alignment(0.5, 0.5) self.add(lab) + lab.set_alignment(0.5, 0.5) + lab.set_width_chars(P.COL_COUNT+1) self.Reset() @@ -295,11 +296,11 @@ class CtrlPanel(gtk.Frame): """ input fields, labels, and buttons at bottom of BlockHead window """ - # offsets into buttons list + # indexes into buttons list DRAW, NEW, HELP, EXIT = range(4) - # offsets into entries/labels lists + # indexes into entries/entry_labels lists N1, N2, ANS = range(3) - + # state of help button HELP_OFF, HELP_ON = 0, 1 def __init__(self): @@ -322,9 +323,6 @@ class CtrlPanel(gtk.Frame): self.entries[i].connect("key_release_event", self.ValidateInput) self.entries[i].set_alignment(0.5) - self.entries[self.ANS].child.set_width_chars(P.COL_COUNT+1) - self.entries[self.ANS].child.set_alignment(0.5, 0.5) - # operator button (toggles "+" and "-") self.opbtn = gtk.Button() self.opbtn.connect("clicked", self.ChangeSign) @@ -400,6 +398,9 @@ class CtrlPanel(gtk.Frame): self.cols[COL_EQ].pack_start(self.algn_equ) self.cols[COL_ANS].pack_start(self.entries[self.ANS]) + fxA = gtk.Fixed() + fxA.set_size_request(5,5) + self.cols[COL_ANS].pack_start(fxA) self.cols[COL_ANS].pack_start(self.entry_labels[self.ANS]) ## @@ -1305,11 +1306,11 @@ def InitializeMode(): """ # adjust labels if Mode == P.ADD_MODE: - Cpnl.entry_labels[0].set_text(P.DISPLAY_STR['first'][0]) - Cpnl.entry_labels[1].set_text(P.DISPLAY_STR['second'][0]) + Cpnl.entry_labels[Cpnl.N1].set_text(P.DISPLAY_STR['first'][0]) + Cpnl.entry_labels[Cpnl.N2].set_text(P.DISPLAY_STR['second'][0]) elif Mode == P.SUBTRACT_MODE: - Cpnl.entry_labels[0].set_text(P.DISPLAY_STR['larger'][0]) - Cpnl.entry_labels[1].set_text(P.DISPLAY_STR['smaller'][0]) + Cpnl.entry_labels[Cpnl.N1].set_text(P.DISPLAY_STR['larger'][0]) + Cpnl.entry_labels[Cpnl.N2].set_text(P.DISPLAY_STR['smaller'][0]) Cpnl.opbtn.set_property("image", Pix[Mode]) @@ -1645,4 +1646,3 @@ if __name__ == "__main__": BlockHeadActivity() gtk.main() sys.exit(0) - diff --git a/activity/activity.info b/activity/activity.info index 77f1b27..90c141e 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,6 +3,6 @@ name = BlockHead bundle_id = org.laptop.BlockHeadActivity class = BlockHeadActivity.BlockHeadActivity icon = activity-blockhead -activity_version = 6 +activity_version = 7 host_version = 1 show_launcher = yes |