Changeset 316
- Timestamp:
- 06/18/06 19:13:26 (2 years ago)
- Files:
-
- trunk/po/es.po (modified) (3 diffs)
- trunk/po/mesk.pot (modified) (3 diffs)
- trunk/src/main_window.py (modified) (1 diff)
- trunk/src/mmkeys/Makefile.in (modified) (1 diff)
- trunk/src/mmkeys/mmkeys.c (modified) (5 diffs)
- trunk/src/multi_media_keys.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/po/es.po
r313 r316 8 8 "Project-Id-Version: 0.1.1\n" 9 9 "Report-Msgid-Bugs-To: \n" 10 "POT-Creation-Date: 2006-06-17 19:17-0600\n"10 "POT-Creation-Date: 2006-06-17 23:01-0600\n" 11 11 "PO-Revision-Date: 2006-04-15 17:38-0600\n" 12 12 "Last-Translator: Travis Shirk <travis@pobox.com>\n" … … 283 283 msgstr "Formato audio sin apoyo: %s" 284 284 285 #: ../src/mesk/audio/mp3.py: 56285 #: ../src/mesk/audio/mp3.py:84 286 286 #, fuzzy, python-format 287 287 msgid "Error reading mp3 source for '%s': %s" 288 288 msgstr "Metadata de la fuente de la lectura de error en '%s': %s" 289 289 290 #: ../src/mesk/audio/oggvorbis.py: 53290 #: ../src/mesk/audio/oggvorbis.py:65 291 291 #, fuzzy, python-format 292 292 msgid "Error reading ogg/vorbis source for '%s': %s" … … 645 645 msgstr " [detenido brevemente]" 646 646 647 #: ../src/plugins/gajimstatus.py:1 79647 #: ../src/plugins/gajimstatus.py:180 648 648 msgid "Gajim must be running in order to determine accounts." 649 649 msgstr "Gajim debe funcionar para determinar cuentas." trunk/po/mesk.pot
r313 r316 9 9 "Project-Id-Version: PACKAGE VERSION\n" 10 10 "Report-Msgid-Bugs-To: \n" 11 "POT-Creation-Date: 2006-06-17 19:17-0600\n"11 "POT-Creation-Date: 2006-06-17 23:01-0600\n" 12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 277 277 msgstr "" 278 278 279 #: ../src/mesk/audio/mp3.py: 56279 #: ../src/mesk/audio/mp3.py:84 280 280 #, python-format 281 281 msgid "Error reading mp3 source for '%s': %s" 282 282 msgstr "" 283 283 284 #: ../src/mesk/audio/oggvorbis.py: 53284 #: ../src/mesk/audio/oggvorbis.py:65 285 285 #, python-format 286 286 msgid "Error reading ogg/vorbis source for '%s': %s" … … 628 628 msgstr "" 629 629 630 #: ../src/plugins/gajimstatus.py:1 79630 #: ../src/plugins/gajimstatus.py:180 631 631 msgid "Gajim must be running in order to determine accounts." 632 632 msgstr "" trunk/src/main_window.py
r311 r316 108 108 # Initialize multi-media keys 109 109 # FIXME 110 #self._mmkeys = MultiMediaKeys(self._audio_control)110 self._mmkeys = MultiMediaKeys(self._audio_control) 111 111 112 112 def _on_playlist_ctrl_changed(self, ctrl): trunk/src/mmkeys/Makefile.in
r307 r316 10 10 cp build/lib*/mmkeys.so . 11 11 12 build: mmkeys py.c12 build: mmkeys.h mmkeys.c mmkeyspy.c 13 13 ./setup.py build 14 14 trunk/src/mmkeys/mmkeys.c
r307 r316 2 2 * Copyright (C) 2004 Lee Willis <lee@leewillis.co.uk> 3 3 * Borrowed heavily from code by Jan Arne Petersen <jpetersen@uni-bonn.de> 4 * Copyright (C) 2006 Travis Shirk <travis@pobox.com> 4 5 * 5 6 * This program is free software; you can redistribute it and/or … … 38 39 MM_PREV, 39 40 MM_STOP, 41 /* TODO 42 MM_RAISE_VOLUME, 43 MM_LOWER_VOLUME, 44 MM_MUTE, 45 MM_EJECT, 46 MM_MEDIA, 47 */ 40 48 LAST_SIGNAL 41 49 }; … … 69 77 } 70 78 79 #define __G_SIGNAL_NEW(signal) \ 80 g_signal_new ((signal), \ 81 G_TYPE_FROM_CLASS (klass), \ 82 G_SIGNAL_RUN_LAST, \ 83 0, NULL, NULL, \ 84 g_cclosure_marshal_VOID__INT, \ 85 G_TYPE_NONE, 1, G_TYPE_INT); 86 71 87 static void 72 88 mmkeys_class_init (MmKeysClass *klass) … … 79 95 object_class->finalize = mmkeys_finalize; 80 96 81 signals[MM_PLAYPAUSE] = 82 g_signal_new ("mm_playpause", 83 G_TYPE_FROM_CLASS (klass), 84 G_SIGNAL_RUN_LAST, 85 0, 86 NULL, NULL, 87 g_cclosure_marshal_VOID__INT, 88 G_TYPE_NONE, 1, G_TYPE_INT); 89 signals[MM_PREV] = 90 g_signal_new ("mm_prev", 91 G_TYPE_FROM_CLASS (klass), 92 G_SIGNAL_RUN_LAST, 93 0, 94 NULL, NULL, 95 g_cclosure_marshal_VOID__INT, 96 G_TYPE_NONE, 1, G_TYPE_INT); 97 signals[MM_NEXT] = 98 g_signal_new ("mm_next", 99 G_TYPE_FROM_CLASS (klass), 100 G_SIGNAL_RUN_LAST, 101 0, 102 NULL, NULL, 103 g_cclosure_marshal_VOID__INT, 104 G_TYPE_NONE, 1, G_TYPE_INT); 105 signals[MM_STOP] = 106 g_signal_new ("mm_stop", 107 G_TYPE_FROM_CLASS (klass), 108 G_SIGNAL_RUN_LAST, 109 0, 110 NULL, NULL, 111 g_cclosure_marshal_VOID__INT, 112 G_TYPE_NONE, 1, G_TYPE_INT); 97 signals[MM_PLAYPAUSE] = __G_SIGNAL_NEW("mm_playpause"); 98 signals[MM_PREV] = __G_SIGNAL_NEW("mm_prev"); 99 signals[MM_NEXT] = __G_SIGNAL_NEW("mm_next"); 100 signals[MM_STOP] = __G_SIGNAL_NEW("mm_stop"); 113 101 } 114 102 … … 217 205 key = (XKeyEvent *) xevent; 218 206 219 if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPlay) == key->keycode) { 207 if (XKeysymToKeycode(GDK_DISPLAY (), 208 XF86XK_AudioPlay) == key->keycode) { 220 209 g_signal_emit (data, signals[MM_PLAYPAUSE], 0, 0); 221 210 return GDK_FILTER_REMOVE; 222 } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPause) == key->keycode) { 211 } else if (XKeysymToKeycode(GDK_DISPLAY (), 212 XF86XK_AudioPause) == key->keycode) { 223 213 g_signal_emit (data, signals[MM_PLAYPAUSE], 0, 0); 224 214 return GDK_FILTER_REMOVE; 225 } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioPrev) == key->keycode) { 215 } else if (XKeysymToKeycode(GDK_DISPLAY (), 216 XF86XK_AudioPrev) == key->keycode) { 226 217 g_signal_emit (data, signals[MM_PREV], 0, 0); 227 218 return GDK_FILTER_REMOVE; 228 } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioNext) == key->keycode) { 219 } else if (XKeysymToKeycode(GDK_DISPLAY(), 220 XF86XK_AudioNext) == key->keycode) { 229 221 g_signal_emit (data, signals[MM_NEXT], 0, 0); 230 222 return GDK_FILTER_REMOVE; 231 } else if (XKeysymToKeycode (GDK_DISPLAY (), XF86XK_AudioStop) == key->keycode) { 223 } else if (XKeysymToKeycode(GDK_DISPLAY(), 224 XF86XK_AudioStop) == key->keycode) { 232 225 g_signal_emit (data, signals[MM_STOP], 0, 0); 233 226 return GDK_FILTER_REMOVE; trunk/src/multi_media_keys.py
r310 r316 31 31 self.__keys = F() 32 32 else: 33 print "MultiMediaKeys" 33 34 self.__keys = mmkeys.MmKeys() 34 35 self.__keys.connect('mm_prev', self.__previous, player) … … 37 38 self.__keys.connect('mm_playpause', self.__play_pause, player) 38 39 40 39 41 def __previous(self, keys, key, player): 40 player.prev() 42 print "__previous" 43 #player.prev() 41 44 def __next(self, keys, key, player): 42 player.next() 45 print "__next" 46 #player.next() 43 47 def __stop(self, keys, key, player): 44 player.paused = True 45 player.seek(0L) 48 print "__stop" 49 #player.paused = True 50 #player.seek(0L) 46 51 47 52 def __play_pause(self, keys, key, player): 48 53 # FIXME 49 p ass54 print "__play_pause" 50 55 #if player.song is None: 51 56 # player.reset()
