diff options
| -rw-r--r-- | InfusedActivity.py | 4 | ||||
| -rwxr-xr-x | genpieces.py | 2 | ||||
| -rw-r--r-- | page.py | 35 | ||||
| -rw-r--r-- | utils/grecord.py | 14 | ||||
| -rw-r--r-- | utils/sprites.py | 6 |
5 files changed, 25 insertions, 36 deletions
diff --git a/InfusedActivity.py b/InfusedActivity.py index 5dfe5a0..4edc31b 100644 --- a/InfusedActivity.py +++ b/InfusedActivity.py @@ -250,11 +250,11 @@ class InfusedActivity(activity.Activity): _separator_factory(record_toolbar) self._playback_button = _button_factory( - 'media-playback-start-insensitive', '', + 'media-playback-start-insensitive', _('Nothing to play'), self._playback_recording_cb, record_toolbar) self._save_recording_button = _button_factory( - 'sound-save-insensitive', '', + 'sound-save-insensitive', _('Nothing to save'), self._save_recording_cb, record_toolbar) _separator_factory(primary_toolbar) diff --git a/genpieces.py b/genpieces.py index 8d8bb82..3837d1b 100755 --- a/genpieces.py +++ b/genpieces.py @@ -39,7 +39,7 @@ class SVG: align = '' svg_string = "<text x=\"%d\" y=\"%d\" " % (x, y) if stroke: - svg_string += "style=\"font-size:%dpx;font-family:Sans;fill:%s;\ + svg_string += "style=\"font-size:%dpx;font-weight:bold;font-family:Sans;fill:%s;\ stroke:#000000;%s\">" % (font_size, self._stroke, align) else: svg_string += "style=\"font-size:%dpx;font-family:Sans;fill:%s;\ @@ -197,10 +197,7 @@ class Page(): scale=self._scale, font_size=40, center=True)))) - if self._color_data[self.page][2]: - stroke = True - else: - stroke = False + stroke = self._test_for_stroke() self._colored_letters.append(Sprite( self._sprites, 0, 0, svg_str_to_pixbuf(generate_card( string=self._card_data[self.page][0].lower(), @@ -215,6 +212,14 @@ class Page(): self._load_card() self._looking_at_word_list = False + def _test_for_stroke(self): + ''' Light colors get a surrounding stroke ''' + # TODO: better value test + if self._color_data[self.page][0][0:4] == '#FFF': + return True + else: + return False + def _load_card(self): ''' a card is a sprite and a message. ''' self._cards[self.page].set_layer(2) @@ -465,28 +470,24 @@ class Page(): if not words[0] in '-+': self._card_data.append([words[0], self._unicode_map(words[1]).replace('-', ', ')]) - if words[4] == 'False': - self._color_data.append( - [words[2], self._unicode_map(words[3]), False]) - else: - self._color_data.append( - [words[2], self._unicode_map(words[3]), True]) + self._color_data.append( + [words[2], self._unicode_map(words[3])]) if len(self._msg_data) == 0: self._msg_data.append(FIRST_CARD) - elif words[5] == 'vowel': + elif words[4] == 'vowel': self._msg_data.append(VOWEL) - elif words[5] == 'light': + elif words[4] == 'light': self._msg_data.append(LIGHT) - elif words[5] == 'consonant': + elif words[4] == 'consonant': self._msg_data.append(CONSONANT) else: - print 'unknown message id %s' % (words[5]) + print 'unknown message id %s' % (words[4]) self._msg_data.append(CONSONANT) - self._sound_data.append(words[6]) + self._sound_data.append(words[5]) if words[0] == '+': - self._test_data = self._unicode_map(words[7]) + self._test_data = self._unicode_map(words[6]) else: - self._word_data.append(self._unicode_map(words[7])) + self._word_data.append(self._unicode_map(words[6])) f.close() self._clear_all() diff --git a/utils/grecord.py b/utils/grecord.py index 061a1d2..5f95d70 100644 --- a/utils/grecord.py +++ b/utils/grecord.py @@ -208,17 +208,3 @@ class Grecord: # message.parse_error() pass - def abandonMedia(self): - self.stop() - - if self._audio_transcode_handler: - gobject.source_remove(self._audio_transcode_handler) - self._audio_transcode_handler = None - if self._transcode_id: - gobject.source_remove(self._transcode_id) - self._transcode_id = None - - wav_path = os.path.join(Instance.instancePath, "output.wav") - if os.path.exists(wav_path): - os.remove(wav_path) - diff --git a/utils/sprites.py b/utils/sprites.py index 9e37694..818a1f3 100644 --- a/utils/sprites.py +++ b/utils/sprites.py @@ -347,8 +347,10 @@ class Sprite: for k in range(len(self.labels)): label_segments = self.labels[k].split('\n') for i in range(len(label_segments)): - pl = self._sprites.canvas.create_pango_layout( - str(label_segments[i])) + pl = self._sprites.canvas.create_pango_layout.set_markup_with_accel( + pango.parse_markup('<b><i>' + str(label_segments[i]) + '</i></b>', + accel_marker=u'\x00') + ) self._fd.set_size(int(self._scale[k] * pango.SCALE)) pl.set_font_description(self._fd) w = pl.get_size()[0] / pango.SCALE |