Jokosher

Merge lp:~michael-sheldon/jokosher/gtk-builder-extensions into lp:jokosher

  1. gtk-builder-extensions
  2. Merge into main
Proposed by Michael Sheldon
Status: Merged
Merged at revision: 1116
Proposed branch: lp:~michael-sheldon/jokosher/gtk-builder-extensions
Merge into: lp:jokosher
Diff against target: 4083 lines (+1683/-1982)
26 files modified
extensions/eggs/ExtensionConsole/setup.py (+2/-2)
extensions/eggs/ExtensionConsole/src/ConsoleDialog.ui (+79/-0)
extensions/eggs/ExtensionConsole/src/ExtensionConsole.glade (+0/-459)
extensions/eggs/ExtensionConsole/src/ExtensionConsole.py (+7/-6)
extensions/eggs/ExtensionConsole/src/SearchDialog.py (+13/-12)
extensions/eggs/ExtensionConsole/src/SearchDialog.ui (+289/-0)
extensions/eggs/FreesoundSearch/setup.py (+2/-2)
extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade (+0/-760)
extensions/eggs/FreesoundSearch/src/FreesoundSearch.gladep (+0/-8)
extensions/eggs/FreesoundSearch/src/FreesoundSearch.py (+32/-31)
extensions/eggs/FreesoundSearch/src/FreesoundSearch.ui (+570/-0)
extensions/eggs/FreesoundSearch/src/LoginDialog.ui (+184/-0)
extensions/eggs/InstrumentTypeManager/setup.py (+2/-2)
extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.glade (+0/-278)
extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.py (+13/-13)
extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.ui (+198/-0)
extensions/eggs/Minimal/setup.py (+2/-2)
extensions/eggs/Minimal/src/Minimal.glade (+0/-186)
extensions/eggs/Minimal/src/Minimal.gladep (+0/-8)
extensions/eggs/Minimal/src/Minimal.py (+15/-17)
extensions/eggs/Minimal/src/Minimal.ui (+131/-0)
extensions/eggs/SetTempo/setup.py (+2/-2)
extensions/eggs/SetTempo/src/SetTempo.glade (+0/-179)
extensions/eggs/SetTempo/src/SetTempo.gladep (+0/-8)
extensions/eggs/SetTempo/src/SetTempo.py (+7/-7)
extensions/eggs/SetTempo/src/SetTempo.ui (+135/-0)
To merge this branch: bzr merge lp:~michael-sheldon/jokosher/gtk-builder-extensions
Reviewer Review Type Date Requested Status
Jokosher Code Pending
Review via email: mp+51582@code.launchpad.net

Description of the change

Updates all extensions that previously used Glade to use GTK Builder instead and fixes a couple of small bugs in some extensions.

To post a comment you must log in.
lp:~michael-sheldon/jokosher/gtk-builder-extensions updated
1125. By Michael Sheldon

Remove usage of os.tmpnam in the Freesound extension (possible security issues, urlretrieve can perform its own temporary file creation safely)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'extensions/ExtensionConsole-0.2-py2.5.egg'
2Binary files extensions/ExtensionConsole-0.2-py2.5.egg 2007-08-16 11:57:40 +0000 and extensions/ExtensionConsole-0.2-py2.5.egg 1970-01-01 00:00:00 +0000 differ
3=== added file 'extensions/ExtensionConsole-1.1-py2.6.egg'
4Binary files extensions/ExtensionConsole-1.1-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/ExtensionConsole-1.1-py2.6.egg 2011-02-28 22:41:14 +0000 differ
5=== added file 'extensions/FreesoundSearch-0.11-py2.6.egg'
6Binary files extensions/FreesoundSearch-0.11-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/FreesoundSearch-0.11-py2.6.egg 2011-02-28 22:41:14 +0000 differ
7=== removed file 'extensions/FreesoundSearch-0.3-py2.6.egg'
8Binary files extensions/FreesoundSearch-0.3-py2.6.egg 2010-06-10 01:14:59 +0000 and extensions/FreesoundSearch-0.3-py2.6.egg 1970-01-01 00:00:00 +0000 differ
9=== added file 'extensions/InstrumentTypeManager-0.11-py2.6.egg'
10Binary files extensions/InstrumentTypeManager-0.11-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/InstrumentTypeManager-0.11-py2.6.egg 2011-02-28 22:41:14 +0000 differ
11=== removed file 'extensions/InstrumentTypeManager-0.2-py2.4.egg'
12Binary files extensions/InstrumentTypeManager-0.2-py2.4.egg 2007-02-03 20:53:32 +0000 and extensions/InstrumentTypeManager-0.2-py2.4.egg 1970-01-01 00:00:00 +0000 differ
13=== added file 'extensions/Minimal-0.11-py2.6.egg'
14Binary files extensions/Minimal-0.11-py2.6.egg 1970-01-01 00:00:00 +0000 and extensions/Minimal-0.11-py2.6.egg 2011-02-28 22:41:14 +0000 differ
15=== removed file 'extensions/Minimal-0.9-py2.4.egg'
16Binary files extensions/Minimal-0.9-py2.4.egg 2007-02-11 04:23:38 +0000 and extensions/Minimal-0.9-py2.4.egg 1970-01-01 00:00:00 +0000 differ
17=== removed file 'extensions/SetTempo-0.1-py2.4.egg'
18Binary files extensions/SetTempo-0.1-py2.4.egg 2007-02-08 00:18:28 +0000 and extensions/SetTempo-0.1-py2.4.egg 1970-01-01 00:00:00 +0000 differ
19=== modified file 'extensions/eggs/ExtensionConsole/setup.py'
20--- extensions/eggs/ExtensionConsole/setup.py 2007-07-10 22:28:20 +0000
21+++ extensions/eggs/ExtensionConsole/setup.py 2011-02-28 22:41:14 +0000
22@@ -2,7 +2,7 @@
23 import sys, os
24 from shutil import copy
25
26-version = "0.2"
27+version = "1.1"
28 setup(name="ExtensionConsole",
29 version=version,
30 author='Laszlo Pandy',
31@@ -15,7 +15,7 @@
32 platforms='linux',
33 packages=["ExtensionConsole"],
34 package_dir={"ExtensionConsole":"src"},
35- package_data={"":["pyconsole.py", "ExtensionConsole.glade"]},
36+ package_data={"":["pyconsole.py", "ConsoleDialog.ui", "SearchDialog.ui"]},
37 entry_points="""
38 [jokosher.extensions]
39 extension = ExtensionConsole:ExtensionConsole
40
41=== added file 'extensions/eggs/ExtensionConsole/src/ConsoleDialog.ui'
42--- extensions/eggs/ExtensionConsole/src/ConsoleDialog.ui 1970-01-01 00:00:00 +0000
43+++ extensions/eggs/ExtensionConsole/src/ConsoleDialog.ui 2011-02-28 22:41:14 +0000
44@@ -0,0 +1,79 @@
45+<?xml version="1.0" encoding="UTF-8"?>
46+<interface>
47+ <requires lib="gtk+" version="2.16"/>
48+ <!-- interface-naming-policy toplevel-contextual -->
49+ <object class="GtkDialog" id="ConsoleDialog">
50+ <property name="title" translatable="yes">Jokosher Extension Console</property>
51+ <property name="default_width">500</property>
52+ <property name="default_height">400</property>
53+ <property name="type_hint">dialog</property>
54+ <property name="has_separator">True</property>
55+ <signal name="delete_event" handler="OnClose"/>
56+ <child internal-child="vbox">
57+ <object class="GtkVBox" id="ConsoleVBox">
58+ <property name="visible">True</property>
59+ <child>
60+ <placeholder/>
61+ </child>
62+ <child internal-child="action_area">
63+ <object class="GtkHButtonBox" id="dialog-action_area2">
64+ <property name="visible">True</property>
65+ <property name="layout_style">end</property>
66+ <child>
67+ <object class="GtkButton" id="button3">
68+ <property name="label" translatable="yes">Search</property>
69+ <property name="visible">True</property>
70+ <property name="can_focus">True</property>
71+ <property name="can_default">True</property>
72+ <property name="receives_default">False</property>
73+ <property name="use_underline">True</property>
74+ <signal name="clicked" handler="OnSearch"/>
75+ </object>
76+ <packing>
77+ <property name="expand">False</property>
78+ <property name="fill">False</property>
79+ <property name="position">0</property>
80+ </packing>
81+ </child>
82+ <child>
83+ <object class="GtkButton" id="button4">
84+ <property name="label">gtk-close</property>
85+ <property name="visible">True</property>
86+ <property name="can_focus">True</property>
87+ <property name="can_default">True</property>
88+ <property name="receives_default">False</property>
89+ <property name="use_stock">True</property>
90+ <signal name="clicked" handler="OnClose"/>
91+ </object>
92+ <packing>
93+ <property name="expand">False</property>
94+ <property name="fill">False</property>
95+ <property name="position">1</property>
96+ </packing>
97+ </child>
98+ </object>
99+ <packing>
100+ <property name="expand">False</property>
101+ <property name="pack_type">end</property>
102+ <property name="position">0</property>
103+ </packing>
104+ </child>
105+ </object>
106+ </child>
107+ <action-widgets>
108+ <action-widget response="0">button3</action-widget>
109+ <action-widget response="-7">button4</action-widget>
110+ </action-widgets>
111+ </object>
112+ <object class="GtkListStore" id="liststore1">
113+ <columns>
114+ <!-- column-name item -->
115+ <column type="gchararray"/>
116+ </columns>
117+ <data>
118+ <row>
119+ <col id="0" translatable="yes">All</col>
120+ </row>
121+ </data>
122+ </object>
123+</interface>
124
125=== removed file 'extensions/eggs/ExtensionConsole/src/ExtensionConsole.glade'
126--- extensions/eggs/ExtensionConsole/src/ExtensionConsole.glade 2007-08-16 11:57:40 +0000
127+++ extensions/eggs/ExtensionConsole/src/ExtensionConsole.glade 1970-01-01 00:00:00 +0000
128@@ -1,459 +0,0 @@
129-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
130-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
131-
132-<glade-interface>
133-
134-<widget class="GtkDialog" id="ConsoleDialog">
135- <property name="title" translatable="yes">Jokosher Extension Console</property>
136- <property name="type">GTK_WINDOW_TOPLEVEL</property>
137- <property name="window_position">GTK_WIN_POS_NONE</property>
138- <property name="modal">False</property>
139- <property name="default_width">500</property>
140- <property name="default_height">400</property>
141- <property name="resizable">True</property>
142- <property name="destroy_with_parent">False</property>
143- <property name="decorated">True</property>
144- <property name="skip_taskbar_hint">False</property>
145- <property name="skip_pager_hint">False</property>
146- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
147- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
148- <property name="focus_on_map">True</property>
149- <property name="urgency_hint">False</property>
150- <property name="has_separator">True</property>
151- <signal name="delete_event" handler="OnClose" last_modification_time="Fri, 06 Jul 2007 15:56:41 GMT"/>
152-
153- <child internal-child="vbox">
154- <widget class="GtkVBox" id="ConsoleVBox">
155- <property name="visible">True</property>
156- <property name="homogeneous">False</property>
157- <property name="spacing">0</property>
158-
159- <child internal-child="action_area">
160- <widget class="GtkHButtonBox" id="dialog-action_area2">
161- <property name="visible">True</property>
162- <property name="layout_style">GTK_BUTTONBOX_END</property>
163-
164- <child>
165- <widget class="GtkButton" id="button3">
166- <property name="visible">True</property>
167- <property name="can_default">True</property>
168- <property name="can_focus">True</property>
169- <property name="label" translatable="yes">Search</property>
170- <property name="use_underline">True</property>
171- <property name="relief">GTK_RELIEF_NORMAL</property>
172- <property name="focus_on_click">True</property>
173- <property name="response_id">0</property>
174- <signal name="clicked" handler="OnSearch" last_modification_time="Fri, 06 Jul 2007 15:49:30 GMT"/>
175- </widget>
176- </child>
177-
178- <child>
179- <widget class="GtkButton" id="button4">
180- <property name="visible">True</property>
181- <property name="can_default">True</property>
182- <property name="can_focus">True</property>
183- <property name="label">gtk-close</property>
184- <property name="use_stock">True</property>
185- <property name="relief">GTK_RELIEF_NORMAL</property>
186- <property name="focus_on_click">True</property>
187- <property name="response_id">-7</property>
188- <signal name="clicked" handler="OnClose" last_modification_time="Fri, 06 Jul 2007 15:49:18 GMT"/>
189- </widget>
190- </child>
191- </widget>
192- <packing>
193- <property name="padding">0</property>
194- <property name="expand">False</property>
195- <property name="fill">True</property>
196- <property name="pack_type">GTK_PACK_END</property>
197- </packing>
198- </child>
199-
200- <child>
201- <placeholder/>
202- </child>
203- </widget>
204- </child>
205-</widget>
206-
207-<widget class="GtkDialog" id="SearchDialog">
208- <property name="visible">True</property>
209- <property name="title" translatable="yes">Jokosher API Search</property>
210- <property name="type">GTK_WINDOW_TOPLEVEL</property>
211- <property name="window_position">GTK_WIN_POS_NONE</property>
212- <property name="modal">False</property>
213- <property name="default_width">500</property>
214- <property name="default_height">400</property>
215- <property name="resizable">True</property>
216- <property name="destroy_with_parent">False</property>
217- <property name="decorated">True</property>
218- <property name="skip_taskbar_hint">False</property>
219- <property name="skip_pager_hint">False</property>
220- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
221- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
222- <property name="focus_on_map">True</property>
223- <property name="urgency_hint">False</property>
224- <property name="has_separator">True</property>
225- <signal name="delete_event" handler="OnClose" last_modification_time="Fri, 06 Jul 2007 16:38:54 GMT"/>
226-
227- <child internal-child="vbox">
228- <widget class="GtkVBox" id="dialog-vbox3">
229- <property name="visible">True</property>
230- <property name="homogeneous">False</property>
231- <property name="spacing">0</property>
232-
233- <child internal-child="action_area">
234- <widget class="GtkHButtonBox" id="dialog-action_area3">
235- <property name="visible">True</property>
236- <property name="layout_style">GTK_BUTTONBOX_END</property>
237-
238- <child>
239- <widget class="GtkButton" id="button7">
240- <property name="visible">True</property>
241- <property name="can_default">True</property>
242- <property name="can_focus">True</property>
243- <property name="label">gtk-add</property>
244- <property name="use_stock">True</property>
245- <property name="relief">GTK_RELIEF_NORMAL</property>
246- <property name="focus_on_click">True</property>
247- <property name="response_id">0</property>
248- <signal name="clicked" handler="OnAdd" last_modification_time="Fri, 06 Jul 2007 16:39:04 GMT"/>
249- </widget>
250- </child>
251-
252- <child>
253- <widget class="GtkButton" id="button8">
254- <property name="visible">True</property>
255- <property name="can_default">True</property>
256- <property name="can_focus">True</property>
257- <property name="label">gtk-close</property>
258- <property name="use_stock">True</property>
259- <property name="relief">GTK_RELIEF_NORMAL</property>
260- <property name="focus_on_click">True</property>
261- <property name="response_id">-7</property>
262- <signal name="clicked" handler="OnClose" last_modification_time="Fri, 06 Jul 2007 16:39:16 GMT"/>
263- </widget>
264- </child>
265- </widget>
266- <packing>
267- <property name="padding">0</property>
268- <property name="expand">False</property>
269- <property name="fill">True</property>
270- <property name="pack_type">GTK_PACK_END</property>
271- </packing>
272- </child>
273-
274- <child>
275- <widget class="GtkVBox" id="vbox1">
276- <property name="visible">True</property>
277- <property name="homogeneous">False</property>
278- <property name="spacing">6</property>
279-
280- <child>
281- <widget class="GtkTable" id="table1">
282- <property name="visible">True</property>
283- <property name="n_rows">3</property>
284- <property name="n_columns">2</property>
285- <property name="homogeneous">False</property>
286- <property name="row_spacing">6</property>
287- <property name="column_spacing">12</property>
288-
289- <child>
290- <widget class="GtkHBox" id="hbox3">
291- <property name="visible">True</property>
292- <property name="homogeneous">False</property>
293- <property name="spacing">6</property>
294-
295- <child>
296- <widget class="GtkCheckButton" id="docsCheckbox">
297- <property name="visible">True</property>
298- <property name="can_focus">True</property>
299- <property name="label" translatable="yes">Documentation</property>
300- <property name="use_underline">True</property>
301- <property name="relief">GTK_RELIEF_NORMAL</property>
302- <property name="focus_on_click">True</property>
303- <property name="active">False</property>
304- <property name="inconsistent">False</property>
305- <property name="draw_indicator">True</property>
306- <signal name="toggled" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:47:13 GMT"/>
307- </widget>
308- <packing>
309- <property name="padding">0</property>
310- <property name="expand">False</property>
311- <property name="fill">False</property>
312- </packing>
313- </child>
314-
315- <child>
316- <widget class="GtkCheckButton" id="argsCheckbox">
317- <property name="visible">True</property>
318- <property name="can_focus">True</property>
319- <property name="label" translatable="yes">Argument Names</property>
320- <property name="use_underline">True</property>
321- <property name="relief">GTK_RELIEF_NORMAL</property>
322- <property name="focus_on_click">True</property>
323- <property name="active">False</property>
324- <property name="inconsistent">False</property>
325- <property name="draw_indicator">True</property>
326- <signal name="toggled" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:47:47 GMT"/>
327- </widget>
328- <packing>
329- <property name="padding">0</property>
330- <property name="expand">False</property>
331- <property name="fill">False</property>
332- </packing>
333- </child>
334-
335- <child>
336- <widget class="GtkCheckButton" id="privateCheckbox">
337- <property name="visible">True</property>
338- <property name="can_focus">True</property>
339- <property name="label" translatable="yes">Private Functions</property>
340- <property name="use_underline">True</property>
341- <property name="relief">GTK_RELIEF_NORMAL</property>
342- <property name="focus_on_click">True</property>
343- <property name="active">False</property>
344- <property name="inconsistent">False</property>
345- <property name="draw_indicator">True</property>
346- <signal name="toggled" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:47:59 GMT"/>
347- </widget>
348- <packing>
349- <property name="padding">0</property>
350- <property name="expand">False</property>
351- <property name="fill">False</property>
352- </packing>
353- </child>
354- </widget>
355- <packing>
356- <property name="left_attach">1</property>
357- <property name="right_attach">2</property>
358- <property name="top_attach">2</property>
359- <property name="bottom_attach">3</property>
360- </packing>
361- </child>
362-
363- <child>
364- <widget class="GtkComboBox" id="moduleCombo">
365- <property name="visible">True</property>
366- <property name="items" translatable="yes">All</property>
367- <property name="add_tearoffs">False</property>
368- <property name="focus_on_click">True</property>
369- <signal name="changed" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:47:24 GMT"/>
370- </widget>
371- <packing>
372- <property name="left_attach">1</property>
373- <property name="right_attach">2</property>
374- <property name="top_attach">1</property>
375- <property name="bottom_attach">2</property>
376- <property name="x_options">fill</property>
377- </packing>
378- </child>
379-
380- <child>
381- <widget class="GtkHBox" id="hbox4">
382- <property name="visible">True</property>
383- <property name="homogeneous">False</property>
384- <property name="spacing">12</property>
385-
386- <child>
387- <widget class="GtkComboBoxEntry" id="searchComboEntry">
388- <property name="visible">True</property>
389- <property name="add_tearoffs">False</property>
390- <property name="has_frame">True</property>
391- <property name="focus_on_click">True</property>
392- <signal name="changed" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:48:41 GMT"/>
393- </widget>
394- <packing>
395- <property name="padding">0</property>
396- <property name="expand">True</property>
397- <property name="fill">True</property>
398- </packing>
399- </child>
400-
401- <child>
402- <widget class="GtkCheckButton" id="regexCheckbox">
403- <property name="visible">True</property>
404- <property name="can_focus">True</property>
405- <property name="label" translatable="yes">Regular Expression</property>
406- <property name="use_underline">True</property>
407- <property name="relief">GTK_RELIEF_NORMAL</property>
408- <property name="focus_on_click">True</property>
409- <property name="active">False</property>
410- <property name="inconsistent">False</property>
411- <property name="draw_indicator">True</property>
412- <signal name="toggled" handler="OptionChanged" last_modification_time="Fri, 06 Jul 2007 12:48:13 GMT"/>
413- </widget>
414- <packing>
415- <property name="padding">0</property>
416- <property name="expand">False</property>
417- <property name="fill">False</property>
418- </packing>
419- </child>
420- </widget>
421- <packing>
422- <property name="left_attach">1</property>
423- <property name="right_attach">2</property>
424- <property name="top_attach">0</property>
425- <property name="bottom_attach">1</property>
426- <property name="x_options">fill</property>
427- </packing>
428- </child>
429-
430- <child>
431- <widget class="GtkLabel" id="label5">
432- <property name="visible">True</property>
433- <property name="label" translatable="yes">Search:</property>
434- <property name="use_underline">False</property>
435- <property name="use_markup">False</property>
436- <property name="justify">GTK_JUSTIFY_LEFT</property>
437- <property name="wrap">False</property>
438- <property name="selectable">False</property>
439- <property name="xalign">0</property>
440- <property name="yalign">0.5</property>
441- <property name="xpad">0</property>
442- <property name="ypad">0</property>
443- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
444- <property name="width_chars">-1</property>
445- <property name="single_line_mode">False</property>
446- <property name="angle">0</property>
447- </widget>
448- <packing>
449- <property name="left_attach">0</property>
450- <property name="right_attach">1</property>
451- <property name="top_attach">0</property>
452- <property name="bottom_attach">1</property>
453- <property name="x_options">fill</property>
454- <property name="y_options"></property>
455- </packing>
456- </child>
457-
458- <child>
459- <widget class="GtkLabel" id="label6">
460- <property name="visible">True</property>
461- <property name="label" translatable="yes">Include:</property>
462- <property name="use_underline">False</property>
463- <property name="use_markup">False</property>
464- <property name="justify">GTK_JUSTIFY_LEFT</property>
465- <property name="wrap">False</property>
466- <property name="selectable">False</property>
467- <property name="xalign">0</property>
468- <property name="yalign">0.5</property>
469- <property name="xpad">0</property>
470- <property name="ypad">0</property>
471- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
472- <property name="width_chars">-1</property>
473- <property name="single_line_mode">False</property>
474- <property name="angle">0</property>
475- </widget>
476- <packing>
477- <property name="left_attach">0</property>
478- <property name="right_attach">1</property>
479- <property name="top_attach">2</property>
480- <property name="bottom_attach">3</property>
481- <property name="x_options">fill</property>
482- <property name="y_options"></property>
483- </packing>
484- </child>
485-
486- <child>
487- <widget class="GtkLabel" id="label7">
488- <property name="visible">True</property>
489- <property name="label" translatable="yes">Module:</property>
490- <property name="use_underline">False</property>
491- <property name="use_markup">False</property>
492- <property name="justify">GTK_JUSTIFY_LEFT</property>
493- <property name="wrap">False</property>
494- <property name="selectable">False</property>
495- <property name="xalign">0</property>
496- <property name="yalign">0.5</property>
497- <property name="xpad">0</property>
498- <property name="ypad">0</property>
499- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
500- <property name="width_chars">-1</property>
501- <property name="single_line_mode">False</property>
502- <property name="angle">0</property>
503- </widget>
504- <packing>
505- <property name="left_attach">0</property>
506- <property name="right_attach">1</property>
507- <property name="top_attach">1</property>
508- <property name="bottom_attach">2</property>
509- <property name="x_options">fill</property>
510- <property name="y_options"></property>
511- </packing>
512- </child>
513- </widget>
514- <packing>
515- <property name="padding">0</property>
516- <property name="expand">False</property>
517- <property name="fill">False</property>
518- </packing>
519- </child>
520-
521- <child>
522- <widget class="GtkScrolledWindow" id="scrolledwindow1">
523- <property name="visible">True</property>
524- <property name="can_focus">True</property>
525- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
526- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
527- <property name="shadow_type">GTK_SHADOW_IN</property>
528- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
529-
530- <child>
531- <widget class="GtkTreeView" id="ResultsTreeview">
532- <property name="visible">True</property>
533- <property name="can_focus">True</property>
534- <property name="headers_visible">False</property>
535- <property name="rules_hint">False</property>
536- <property name="reorderable">True</property>
537- <property name="enable_search">True</property>
538- <property name="fixed_height_mode">True</property>
539- <property name="hover_selection">False</property>
540- <property name="hover_expand">False</property>
541- <signal name="cursor_changed" handler="on_Selection_changed" last_modification_time="Fri, 06 Jul 2007 12:50:35 GMT"/>
542- </widget>
543- </child>
544- </widget>
545- <packing>
546- <property name="padding">0</property>
547- <property name="expand">True</property>
548- <property name="fill">True</property>
549- </packing>
550- </child>
551-
552- <child>
553- <widget class="GtkLabel" id="documentationLabel">
554- <property name="can_focus">True</property>
555- <property name="label" translatable="yes"></property>
556- <property name="use_underline">False</property>
557- <property name="use_markup">False</property>
558- <property name="justify">GTK_JUSTIFY_LEFT</property>
559- <property name="wrap">False</property>
560- <property name="selectable">True</property>
561- <property name="xalign">0</property>
562- <property name="yalign">0.5</property>
563- <property name="xpad">12</property>
564- <property name="ypad">6</property>
565- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
566- <property name="width_chars">-1</property>
567- <property name="single_line_mode">False</property>
568- <property name="angle">0</property>
569- </widget>
570- <packing>
571- <property name="padding">0</property>
572- <property name="expand">False</property>
573- <property name="fill">False</property>
574- </packing>
575- </child>
576- </widget>
577- <packing>
578- <property name="padding">0</property>
579- <property name="expand">True</property>
580- <property name="fill">True</property>
581- </packing>
582- </child>
583- </widget>
584- </child>
585-</widget>
586-
587-</glade-interface>
588
589=== modified file 'extensions/eggs/ExtensionConsole/src/ExtensionConsole.py'
590--- extensions/eggs/ExtensionConsole/src/ExtensionConsole.py 2007-07-10 22:28:20 +0000
591+++ extensions/eggs/ExtensionConsole/src/ExtensionConsole.py 2011-02-28 22:41:14 +0000
592@@ -19,7 +19,7 @@
593
594 EXTENSION_NAME = "Extension Console"
595 EXTENSION_DESCRIPTION = "A fully functional python console with access to the extension API and the Jokosher internals"
596- EXTENSION_VERSION = "1.0"
597+ EXTENSION_VERSION = "1.1"
598
599 CONSOLE_BANNER = "Jokosher Extension Console"
600
601@@ -35,8 +35,9 @@
602 self.api = api
603 self.menuItem = self.api.add_menu_item("Extension Console", self.OnMenuItemClick)
604
605- xmlString = pkg_resources.resource_string(__name__, "ExtensionConsole.glade")
606- self.wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString), "ConsoleDialog")
607+ xmlString = pkg_resources.resource_string(__name__, "ConsoleDialog.ui")
608+ self.gtkBuilder = gtk.Builder()
609+ self.gtkBuilder.add_from_string(xmlString)
610
611 self.savedStdin = sys.stdin
612 sys.stdin = StdinWrapper()
613@@ -46,7 +47,7 @@
614 "OnSearch" : self.OnSearch,
615 }
616
617- self.wTree.signal_autoconnect(self.signals)
618+ self.gtkBuilder.connect_signals(self.signals)
619
620 #the default namespace for the console
621 self.namespace = {
622@@ -54,8 +55,8 @@
623 "api": self.api
624 }
625
626- self.window = self.wTree.get_widget("ConsoleDialog")
627- self.vbox = self.wTree.get_widget("ConsoleVBox")
628+ self.window = self.gtkBuilder.get_object("ConsoleDialog")
629+ self.vbox = self.gtkBuilder.get_object("ConsoleVBox")
630 self.search = None
631 self.swin = gtk.ScrolledWindow()
632 self.swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
633
634=== modified file 'extensions/eggs/ExtensionConsole/src/SearchDialog.py'
635--- extensions/eggs/ExtensionConsole/src/SearchDialog.py 2007-07-10 22:28:20 +0000
636+++ extensions/eggs/ExtensionConsole/src/SearchDialog.py 2011-02-28 22:41:14 +0000
637@@ -28,8 +28,9 @@
638 self.parent = parent
639 self.writeCallback = writeCallback
640
641- xmlString = pkg_resources.resource_string(__name__, "ExtensionConsole.glade")
642- self.wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString), "SearchDialog")
643+ xmlString = pkg_resources.resource_string(__name__, "SearchDialog.ui")
644+ self.gtkBuilder = gtk.Builder()
645+ self.gtkBuilder.add_from_string(xmlString)
646
647 self.signals = {
648 "OnAdd" : self.OnAdd,
649@@ -38,17 +39,17 @@
650 "on_Selection_changed" : self.OnSelectionChange,
651 }
652
653- self.wTree.signal_autoconnect(self.signals)
654+ self.gtkBuilder.connect_signals(self.signals)
655
656- self.dlg = self.wTree.get_widget("SearchDialog")
657- self.treeview = self.wTree.get_widget("ResultsTreeview")
658- self.searchCombo = self.wTree.get_widget("searchComboEntry")
659- self.moduleCombo = self.wTree.get_widget("moduleCombo")
660- self.regexCheckbox = self.wTree.get_widget("regexCheckbox")
661- self.docsCheckbox = self.wTree.get_widget("docsCheckbox")
662- self.argsCheckbox = self.wTree.get_widget("argsCheckbox")
663- self.privateCheckbox = self.wTree.get_widget("privateCheckbox")
664- self.documentationLabel = self.wTree.get_widget("documentationLabel")
665+ self.dlg = self.gtkBuilder.get_object("SearchDialog")
666+ self.treeview = self.gtkBuilder.get_object("ResultsTreeview")
667+ self.searchCombo = self.gtkBuilder.get_object("searchComboEntry")
668+ self.moduleCombo = self.gtkBuilder.get_object("moduleCombo")
669+ self.regexCheckbox = self.gtkBuilder.get_object("regexCheckbox")
670+ self.docsCheckbox = self.gtkBuilder.get_object("docsCheckbox")
671+ self.argsCheckbox = self.gtkBuilder.get_object("argsCheckbox")
672+ self.privateCheckbox = self.gtkBuilder.get_object("privateCheckbox")
673+ self.documentationLabel = self.gtkBuilder.get_object("documentationLabel")
674
675 self.model = gtk.ListStore(str, object)
676 self.treeview.set_model(self.model)
677
678=== added file 'extensions/eggs/ExtensionConsole/src/SearchDialog.ui'
679--- extensions/eggs/ExtensionConsole/src/SearchDialog.ui 1970-01-01 00:00:00 +0000
680+++ extensions/eggs/ExtensionConsole/src/SearchDialog.ui 2011-02-28 22:41:14 +0000
681@@ -0,0 +1,289 @@
682+<?xml version="1.0" encoding="UTF-8"?>
683+<interface>
684+ <requires lib="gtk+" version="2.16"/>
685+ <!-- interface-naming-policy toplevel-contextual -->
686+ <object class="GtkListStore" id="liststore1">
687+ <columns>
688+ <!-- column-name item -->
689+ <column type="gchararray"/>
690+ </columns>
691+ <data>
692+ <row>
693+ <col id="0" translatable="yes">All</col>
694+ </row>
695+ </data>
696+ </object>
697+ <object class="GtkDialog" id="SearchDialog">
698+ <property name="visible">True</property>
699+ <property name="title" translatable="yes">Jokosher API Search</property>
700+ <property name="default_width">500</property>
701+ <property name="default_height">400</property>
702+ <property name="type_hint">dialog</property>
703+ <property name="has_separator">True</property>
704+ <signal name="delete_event" handler="OnClose"/>
705+ <child internal-child="vbox">
706+ <object class="GtkVBox" id="dialog-vbox3">
707+ <property name="visible">True</property>
708+ <child>
709+ <object class="GtkVBox" id="vbox1">
710+ <property name="visible">True</property>
711+ <property name="spacing">6</property>
712+ <child>
713+ <object class="GtkTable" id="table1">
714+ <property name="visible">True</property>
715+ <property name="n_rows">3</property>
716+ <property name="n_columns">2</property>
717+ <property name="column_spacing">12</property>
718+ <property name="row_spacing">6</property>
719+ <child>
720+ <object class="GtkHBox" id="hbox3">
721+ <property name="visible">True</property>
722+ <property name="spacing">6</property>
723+ <child>
724+ <object class="GtkCheckButton" id="docsCheckbox">
725+ <property name="label" translatable="yes">Documentation</property>
726+ <property name="visible">True</property>
727+ <property name="can_focus">True</property>
728+ <property name="receives_default">False</property>
729+ <property name="use_underline">True</property>
730+ <property name="draw_indicator">True</property>
731+ <signal name="toggled" handler="OptionChanged"/>
732+ </object>
733+ <packing>
734+ <property name="expand">False</property>
735+ <property name="fill">False</property>
736+ <property name="position">0</property>
737+ </packing>
738+ </child>
739+ <child>
740+ <object class="GtkCheckButton" id="argsCheckbox">
741+ <property name="label" translatable="yes">Argument Names</property>
742+ <property name="visible">True</property>
743+ <property name="can_focus">True</property>
744+ <property name="receives_default">False</property>
745+ <property name="use_underline">True</property>
746+ <property name="draw_indicator">True</property>
747+ <signal name="toggled" handler="OptionChanged"/>
748+ </object>
749+ <packing>
750+ <property name="expand">False</property>
751+ <property name="fill">False</property>
752+ <property name="position">1</property>
753+ </packing>
754+ </child>
755+ <child>
756+ <object class="GtkCheckButton" id="privateCheckbox">
757+ <property name="label" translatable="yes">Private Functions</property>
758+ <property name="visible">True</property>
759+ <property name="can_focus">True</property>
760+ <property name="receives_default">False</property>
761+ <property name="use_underline">True</property>
762+ <property name="draw_indicator">True</property>
763+ <signal name="toggled" handler="OptionChanged"/>
764+ </object>
765+ <packing>
766+ <property name="expand">False</property>
767+ <property name="fill">False</property>
768+ <property name="position">2</property>
769+ </packing>
770+ </child>
771+ </object>
772+ <packing>
773+ <property name="left_attach">1</property>
774+ <property name="right_attach">2</property>
775+ <property name="top_attach">2</property>
776+ <property name="bottom_attach">3</property>
777+ </packing>
778+ </child>
779+ <child>
780+ <object class="GtkComboBox" id="moduleCombo">
781+ <property name="visible">True</property>
782+ <property name="model">liststore1</property>
783+ <signal name="changed" handler="OptionChanged"/>
784+ <child>
785+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
786+ <attributes>
787+ <attribute name="text">0</attribute>
788+ </attributes>
789+ </child>
790+ </object>
791+ <packing>
792+ <property name="left_attach">1</property>
793+ <property name="right_attach">2</property>
794+ <property name="top_attach">1</property>
795+ <property name="bottom_attach">2</property>
796+ <property name="x_options">GTK_FILL</property>
797+ </packing>
798+ </child>
799+ <child>
800+ <object class="GtkHBox" id="hbox4">
801+ <property name="visible">True</property>
802+ <property name="spacing">12</property>
803+ <child>
804+ <object class="GtkComboBoxEntry" id="searchComboEntry">
805+ <property name="visible">True</property>
806+ <signal name="changed" handler="OptionChanged"/>
807+ </object>
808+ <packing>
809+ <property name="position">0</property>
810+ </packing>
811+ </child>
812+ <child>
813+ <object class="GtkCheckButton" id="regexCheckbox">
814+ <property name="label" translatable="yes">Regular Expression</property>
815+ <property name="visible">True</property>
816+ <property name="can_focus">True</property>
817+ <property name="receives_default">False</property>
818+ <property name="use_underline">True</property>
819+ <property name="draw_indicator">True</property>
820+ <signal name="toggled" handler="OptionChanged"/>
821+ </object>
822+ <packing>
823+ <property name="expand">False</property>
824+ <property name="fill">False</property>
825+ <property name="position">1</property>
826+ </packing>
827+ </child>
828+ </object>
829+ <packing>
830+ <property name="left_attach">1</property>
831+ <property name="right_attach">2</property>
832+ <property name="x_options">GTK_FILL</property>
833+ </packing>
834+ </child>
835+ <child>
836+ <object class="GtkLabel" id="label5">
837+ <property name="visible">True</property>
838+ <property name="xalign">0</property>
839+ <property name="label" translatable="yes">Search:</property>
840+ </object>
841+ <packing>
842+ <property name="x_options">GTK_FILL</property>
843+ <property name="y_options"></property>
844+ </packing>
845+ </child>
846+ <child>
847+ <object class="GtkLabel" id="label6">
848+ <property name="visible">True</property>
849+ <property name="xalign">0</property>
850+ <property name="label" translatable="yes">Include:</property>
851+ </object>
852+ <packing>
853+ <property name="top_attach">2</property>
854+ <property name="bottom_attach">3</property>
855+ <property name="x_options">GTK_FILL</property>
856+ <property name="y_options"></property>
857+ </packing>
858+ </child>
859+ <child>
860+ <object class="GtkLabel" id="label7">
861+ <property name="visible">True</property>
862+ <property name="xalign">0</property>
863+ <property name="label" translatable="yes">Module:</property>
864+ </object>
865+ <packing>
866+ <property name="top_attach">1</property>
867+ <property name="bottom_attach">2</property>
868+ <property name="x_options">GTK_FILL</property>
869+ <property name="y_options"></property>
870+ </packing>
871+ </child>
872+ </object>
873+ <packing>
874+ <property name="expand">False</property>
875+ <property name="fill">False</property>
876+ <property name="position">0</property>
877+ </packing>
878+ </child>
879+ <child>
880+ <object class="GtkScrolledWindow" id="scrolledwindow1">
881+ <property name="visible">True</property>
882+ <property name="can_focus">True</property>
883+ <property name="hscrollbar_policy">automatic</property>
884+ <property name="vscrollbar_policy">automatic</property>
885+ <property name="shadow_type">in</property>
886+ <child>
887+ <object class="GtkTreeView" id="ResultsTreeview">
888+ <property name="visible">True</property>
889+ <property name="can_focus">True</property>
890+ <property name="headers_visible">False</property>
891+ <property name="reorderable">True</property>
892+ <property name="fixed_height_mode">True</property>
893+ <signal name="cursor_changed" handler="on_Selection_changed"/>
894+ </object>
895+ </child>
896+ </object>
897+ <packing>
898+ <property name="position">1</property>
899+ </packing>
900+ </child>
901+ <child>
902+ <object class="GtkLabel" id="documentationLabel">
903+ <property name="can_focus">True</property>
904+ <property name="xalign">0</property>
905+ <property name="xpad">12</property>
906+ <property name="ypad">6</property>
907+ <property name="selectable">True</property>
908+ </object>
909+ <packing>
910+ <property name="expand">False</property>
911+ <property name="fill">False</property>
912+ <property name="position">2</property>
913+ </packing>
914+ </child>
915+ </object>
916+ <packing>
917+ <property name="position">2</property>
918+ </packing>
919+ </child>
920+ <child internal-child="action_area">
921+ <object class="GtkHButtonBox" id="dialog-action_area3">
922+ <property name="visible">True</property>
923+ <property name="layout_style">end</property>
924+ <child>
925+ <object class="GtkButton" id="button7">
926+ <property name="label">gtk-add</property>
927+ <property name="visible">True</property>
928+ <property name="can_focus">True</property>
929+ <property name="can_default">True</property>
930+ <property name="receives_default">False</property>
931+ <property name="use_stock">True</property>
932+ <signal name="clicked" handler="OnAdd"/>
933+ </object>
934+ <packing>
935+ <property name="expand">False</property>
936+ <property name="fill">False</property>
937+ <property name="position">0</property>
938+ </packing>
939+ </child>
940+ <child>
941+ <object class="GtkButton" id="button8">
942+ <property name="label">gtk-close</property>
943+ <property name="visible">True</property>
944+ <property name="can_focus">True</property>
945+ <property name="can_default">True</property>
946+ <property name="receives_default">False</property>
947+ <property name="use_stock">True</property>
948+ <signal name="clicked" handler="OnClose"/>
949+ </object>
950+ <packing>
951+ <property name="expand">False</property>
952+ <property name="fill">False</property>
953+ <property name="position">1</property>
954+ </packing>
955+ </child>
956+ </object>
957+ <packing>
958+ <property name="expand">False</property>
959+ <property name="pack_type">end</property>
960+ <property name="position">0</property>
961+ </packing>
962+ </child>
963+ </object>
964+ </child>
965+ <action-widgets>
966+ <action-widget response="0">button7</action-widget>
967+ <action-widget response="-7">button8</action-widget>
968+ </action-widgets>
969+ </object>
970+</interface>
971
972=== modified file 'extensions/eggs/FreesoundSearch/setup.py'
973--- extensions/eggs/FreesoundSearch/setup.py 2009-05-29 23:03:59 +0000
974+++ extensions/eggs/FreesoundSearch/setup.py 2011-02-28 22:41:14 +0000
975@@ -2,7 +2,7 @@
976 import sys, os
977 from shutil import copy
978
979-version = "0.3"
980+version = "0.11"
981 setup(name="FreesoundSearch",
982 version=version,
983 author='Stuart Langridge, David Corrales',
984@@ -15,7 +15,7 @@
985 platforms='linux',
986 packages=["FreesoundSearch"],
987 package_dir={"FreesoundSearch":"src"},
988- package_data={"":["FreesoundSearch.glade", "freesound.py", "images/banner.png"]},
989+ package_data={"":["FreesoundSearch.ui", "LoginDialog.ui", "freesound.py", "images/banner.png"]},
990 entry_points="""
991 [jokosher.extensions]
992 extension = FreesoundSearch:FreesoundSearch
993
994=== removed file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade'
995--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 2009-06-08 13:56:43 +0000
996+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.glade 1970-01-01 00:00:00 +0000
997@@ -1,760 +0,0 @@
998-<?xml version="1.0"?>
999-<glade-interface>
1000- <!-- interface-requires gtk+ 2.16 -->
1001- <!-- interface-naming-policy toplevel-contextual -->
1002- <widget class="GtkWindow" id="FreesoundSearchWindow">
1003- <property name="visible">True</property>
1004- <property name="title" translatable="yes">Search Freesound</property>
1005- <property name="window_position">center</property>
1006- <property name="default_width">620</property>
1007- <property name="default_height">450</property>
1008- <signal name="destroy" handler="on_destroy"/>
1009- <child>
1010- <widget class="GtkVBox" id="vboxMain">
1011- <property name="visible">True</property>
1012- <property name="spacing">6</property>
1013- <child>
1014- <widget class="GtkEventBox" id="eventboxHeader">
1015- <property name="visible">True</property>
1016- <child>
1017- <widget class="GtkImage" id="imageHeader">
1018- <property name="visible">True</property>
1019- </widget>
1020- </child>
1021- </widget>
1022- <packing>
1023- <property name="expand">False</property>
1024- <property name="position">0</property>
1025- </packing>
1026- </child>
1027- <child>
1028- <widget class="GtkNotebook" id="notebook">
1029- <property name="visible">True</property>
1030- <property name="can_focus">True</property>
1031- <property name="border_width">13</property>
1032- <child>
1033- <widget class="GtkVBox" id="vboxQuery">
1034- <property name="visible">True</property>
1035- <property name="border_width">12</property>
1036- <property name="spacing">6</property>
1037- <child>
1038- <widget class="GtkLabel" id="label1">
1039- <property name="visible">True</property>
1040- <property name="xalign">0</property>
1041- <property name="label" translatable="yes">Search the Freesound library samples.
1042-
1043-&lt;b&gt;Drag and drop&lt;/b&gt; samples on to your project to add them.</property>
1044- <property name="use_markup">True</property>
1045- </widget>
1046- <packing>
1047- <property name="expand">False</property>
1048- <property name="fill">False</property>
1049- <property name="position">0</property>
1050- </packing>
1051- </child>
1052- <child>
1053- <widget class="GtkHBox" id="hboxFind">
1054- <property name="visible">True</property>
1055- <property name="spacing">6</property>
1056- <child>
1057- <widget class="GtkEntry" id="entryFind">
1058- <property name="visible">True</property>
1059- <property name="can_focus">True</property>
1060- <property name="invisible_char">&#x25CF;</property>
1061- <property name="text" translatable="yes">Type your query here then press "Find"</property>
1062- </widget>
1063- <packing>
1064- <property name="position">0</property>
1065- </packing>
1066- </child>
1067- <child>
1068- <widget class="GtkButton" id="buttonFind">
1069- <property name="visible">True</property>
1070- <property name="can_focus">True</property>
1071- <property name="receives_default">False</property>
1072- <property name="tooltip" translatable="yes">Search the Freesound library</property>
1073- <signal name="clicked" handler="on_buttonFind_clicked"/>
1074- <child>
1075- <widget class="GtkAlignment" id="alignment2">
1076- <property name="visible">True</property>
1077- <property name="xscale">0</property>
1078- <property name="yscale">0</property>
1079- <child>
1080- <widget class="GtkHBox" id="hbox4">
1081- <property name="visible">True</property>
1082- <property name="spacing">2</property>
1083- <child>
1084- <widget class="GtkImage" id="image3">
1085- <property name="visible">True</property>
1086- <property name="stock">gtk-find</property>
1087- </widget>
1088- <packing>
1089- <property name="expand">False</property>
1090- <property name="fill">False</property>
1091- <property name="position">0</property>
1092- </packing>
1093- </child>
1094- <child>
1095- <widget class="GtkLabel" id="label21">
1096- <property name="visible">True</property>
1097- <property name="label">_Find</property>
1098- <property name="use_underline">True</property>
1099- </widget>
1100- <packing>
1101- <property name="expand">False</property>
1102- <property name="fill">False</property>
1103- <property name="position">1</property>
1104- </packing>
1105- </child>
1106- </widget>
1107- </child>
1108- </widget>
1109- </child>
1110- </widget>
1111- <packing>
1112- <property name="expand">False</property>
1113- <property name="fill">False</property>
1114- <property name="position">1</property>
1115- </packing>
1116- </child>
1117- </widget>
1118- <packing>
1119- <property name="expand">False</property>
1120- <property name="position">1</property>
1121- </packing>
1122- </child>
1123- <child>
1124- <widget class="GtkExpander" id="expander">
1125- <property name="visible">True</property>
1126- <property name="can_focus">True</property>
1127- <property name="spacing">6</property>
1128- <child>
1129- <widget class="GtkVBox" id="vbox4">
1130- <property name="visible">True</property>
1131- <property name="spacing">7</property>
1132- <child>
1133- <widget class="GtkHBox" id="hboxOptions">
1134- <property name="visible">True</property>
1135- <property name="spacing">6</property>
1136- <child>
1137- <widget class="GtkLabel" id="label9">
1138- <property name="visible">True</property>
1139- <property name="label" translatable="yes">Search in:</property>
1140- </widget>
1141- <packing>
1142- <property name="expand">False</property>
1143- <property name="fill">False</property>
1144- <property name="position">0</property>
1145- </packing>
1146- </child>
1147- <child>
1148- <widget class="GtkCheckButton" id="checkbuttonDescriptions">
1149- <property name="label" translatable="yes">Descriptions</property>
1150- <property name="visible">True</property>
1151- <property name="can_focus">True</property>
1152- <property name="receives_default">False</property>
1153- <property name="tooltip" translatable="yes">Include samples descriptions in the query</property>
1154- <property name="use_underline">True</property>
1155- <property name="active">True</property>
1156- <property name="draw_indicator">True</property>
1157- </widget>
1158- <packing>
1159- <property name="expand">False</property>
1160- <property name="fill">False</property>
1161- <property name="position">1</property>
1162- </packing>
1163- </child>
1164- <child>
1165- <widget class="GtkCheckButton" id="checkbuttonTags">
1166- <property name="label" translatable="yes">Tags</property>
1167- <property name="visible">True</property>
1168- <property name="can_focus">True</property>
1169- <property name="receives_default">False</property>
1170- <property name="tooltip" translatable="yes">Include samples user given tags in the query</property>
1171- <property name="use_underline">True</property>
1172- <property name="active">True</property>
1173- <property name="draw_indicator">True</property>
1174- </widget>
1175- <packing>
1176- <property name="expand">False</property>
1177- <property name="fill">False</property>
1178- <property name="position">2</property>
1179- </packing>
1180- </child>
1181- <child>
1182- <widget class="GtkCheckButton" id="checkbuttonFilenames">
1183- <property name="label" translatable="yes">Filenames</property>
1184- <property name="visible">True</property>
1185- <property name="can_focus">True</property>
1186- <property name="receives_default">False</property>
1187- <property name="tooltip" translatable="yes">Include samples filenames in the query</property>
1188- <property name="use_underline">True</property>
1189- <property name="draw_indicator">True</property>
1190- </widget>
1191- <packing>
1192- <property name="expand">False</property>
1193- <property name="fill">False</property>
1194- <property name="position">3</property>
1195- </packing>
1196- </child>
1197- <child>
1198- <widget class="GtkCheckButton" id="checkbuttonUsernames">
1199- <property name="label" translatable="yes">Usernames</property>
1200- <property name="visible">True</property>
1201- <property name="can_focus">True</property>
1202- <property name="receives_default">False</property>
1203- <property name="tooltip" translatable="yes">Include Freesound accounts usernames in the query</property>
1204- <property name="use_underline">True</property>
1205- <property name="draw_indicator">True</property>
1206- </widget>
1207- <packing>
1208- <property name="expand">False</property>
1209- <property name="fill">False</property>
1210- <property name="position">4</property>
1211- </packing>
1212- </child>
1213- </widget>
1214- <packing>
1215- <property name="position">0</property>
1216- </packing>
1217- </child>
1218- <child>
1219- <widget class="GtkHBox" id="hbox1">
1220- <property name="visible">True</property>
1221- <property name="spacing">6</property>
1222- <child>
1223- <widget class="GtkLabel" id="label10">
1224- <property name="visible">True</property>
1225- <property name="label" translatable="yes">Maximum number of results:</property>
1226- </widget>
1227- <packing>
1228- <property name="expand">False</property>
1229- <property name="fill">False</property>
1230- <property name="position">0</property>
1231- </packing>
1232- </child>
1233- <child>
1234- <widget class="GtkSpinButton" id="spinbuttonResults">
1235- <property name="visible">True</property>
1236- <property name="can_focus">True</property>
1237- <property name="tooltip" translatable="yes">Maximum number of results to display</property>
1238- <property name="adjustment">15 1 100 1 10 10</property>
1239- <property name="climb_rate">1</property>
1240- <property name="numeric">True</property>
1241- <signal name="value_changed" handler="on_spinbuttonResults_value_changed"/>
1242- </widget>
1243- <packing>
1244- <property name="expand">False</property>
1245- <property name="position">1</property>
1246- </packing>
1247- </child>
1248- </widget>
1249- <packing>
1250- <property name="position">1</property>
1251- </packing>
1252- </child>
1253- </widget>
1254- </child>
1255- <child>
1256- <widget class="GtkLabel" id="label2">
1257- <property name="visible">True</property>
1258- <property name="label" translatable="yes">Advanced search options</property>
1259- </widget>
1260- <packing>
1261- <property name="type">label_item</property>
1262- </packing>
1263- </child>
1264- </widget>
1265- <packing>
1266- <property name="expand">False</property>
1267- <property name="position">2</property>
1268- </packing>
1269- </child>
1270- <child>
1271- <widget class="GtkScrolledWindow" id="scrolledwindowResults">
1272- <property name="visible">True</property>
1273- <property name="can_focus">True</property>
1274- <property name="hscrollbar_policy">automatic</property>
1275- <property name="vscrollbar_policy">automatic</property>
1276- <child>
1277- <widget class="GtkViewport" id="viewport">
1278- <property name="visible">True</property>
1279- <child>
1280- <placeholder/>
1281- </child>
1282- </widget>
1283- </child>
1284- </widget>
1285- <packing>
1286- <property name="position">3</property>
1287- </packing>
1288- </child>
1289- </widget>
1290- </child>
1291- <child>
1292- <widget class="GtkLabel" id="label3">
1293- <property name="visible">True</property>
1294- <property name="label" translatable="yes">Search</property>
1295- </widget>
1296- <packing>
1297- <property name="tab_fill">False</property>
1298- <property name="type">tab</property>
1299- </packing>
1300- </child>
1301- <child>
1302- <widget class="GtkVBox" id="vboxHistory">
1303- <property name="visible">True</property>
1304- <property name="border_width">12</property>
1305- <property name="spacing">6</property>
1306- <child>
1307- <widget class="GtkLabel" id="label12">
1308- <property name="visible">True</property>
1309- <property name="xalign">0</property>
1310- <property name="label" translatable="yes">Browse your used sample history</property>
1311- </widget>
1312- <packing>
1313- <property name="expand">False</property>
1314- <property name="fill">False</property>
1315- <property name="position">0</property>
1316- </packing>
1317- </child>
1318- <child>
1319- <widget class="GtkScrolledWindow" id="scrolledwindow">
1320- <property name="visible">True</property>
1321- <property name="can_focus">True</property>
1322- <property name="hscrollbar_policy">automatic</property>
1323- <property name="vscrollbar_policy">automatic</property>
1324- <property name="shadow_type">in</property>
1325- <child>
1326- <widget class="GtkTreeView" id="treeviewHistory">
1327- <property name="visible">True</property>
1328- <property name="can_focus">True</property>
1329- <property name="tooltip" translatable="yes">Browse all the Freesound samples used in your projects</property>
1330- <property name="headers_visible">False</property>
1331- </widget>
1332- </child>
1333- </widget>
1334- <packing>
1335- <property name="position">1</property>
1336- </packing>
1337- </child>
1338- <child>
1339- <widget class="GtkHBox" id="hboxHistoryButtons">
1340- <property name="visible">True</property>
1341- <property name="spacing">6</property>
1342- <child>
1343- <widget class="GtkLabel" id="label13">
1344- <property name="visible">True</property>
1345- </widget>
1346- <packing>
1347- <property name="position">0</property>
1348- </packing>
1349- </child>
1350- <child>
1351- <widget class="GtkButton" id="buttonDelete">
1352- <property name="label">gtk-delete</property>
1353- <property name="visible">True</property>
1354- <property name="can_focus">True</property>
1355- <property name="receives_default">False</property>
1356- <property name="tooltip" translatable="yes">Delete the selected sample or artist</property>
1357- <property name="use_stock">True</property>
1358- <signal name="clicked" handler="on_buttonDelete_clicked"/>
1359- </widget>
1360- <packing>
1361- <property name="expand">False</property>
1362- <property name="fill">False</property>
1363- <property name="position">1</property>
1364- </packing>
1365- </child>
1366- <child>
1367- <widget class="GtkButton" id="buttonCopy">
1368- <property name="label">gtk-copy</property>
1369- <property name="visible">True</property>
1370- <property name="can_focus">True</property>
1371- <property name="receives_default">False</property>
1372- <property name="tooltip" translatable="yes">Copy the sample or artist information to the clipboard</property>
1373- <property name="use_stock">True</property>
1374- <signal name="clicked" handler="on_buttonCopy_clicked"/>
1375- </widget>
1376- <packing>
1377- <property name="expand">False</property>
1378- <property name="fill">False</property>
1379- <property name="position">2</property>
1380- </packing>
1381- </child>
1382- </widget>
1383- <packing>
1384- <property name="expand">False</property>
1385- <property name="position">2</property>
1386- </packing>
1387- </child>
1388- </widget>
1389- <packing>
1390- <property name="position">1</property>
1391- </packing>
1392- </child>
1393- <child>
1394- <widget class="GtkLabel" id="label4">
1395- <property name="visible">True</property>
1396- <property name="label" translatable="yes">History</property>
1397- </widget>
1398- <packing>
1399- <property name="position">1</property>
1400- <property name="tab_fill">False</property>
1401- <property name="type">tab</property>
1402- </packing>
1403- </child>
1404- <child>
1405- <widget class="GtkVBox" id="vboxAbout">
1406- <property name="visible">True</property>
1407- <property name="border_width">12</property>
1408- <property name="spacing">6</property>
1409- <child>
1410- <widget class="GtkHBox" id="hbox3">
1411- <property name="visible">True</property>
1412- <property name="spacing">6</property>
1413- <child>
1414- <widget class="GtkImage" id="image2">
1415- <property name="visible">True</property>
1416- <property name="xalign">1</property>
1417- <property name="yalign">0</property>
1418- <property name="stock">gtk-about</property>
1419- </widget>
1420- <packing>
1421- <property name="position">0</property>
1422- </packing>
1423- </child>
1424- <child>
1425- <widget class="GtkLabel" id="label14">
1426- <property name="visible">True</property>
1427- <property name="xalign">0</property>
1428- <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Jokosher Freesound Extension&lt;/b&gt;&lt;/big&gt;
1429-version 0.3</property>
1430- <property name="use_markup">True</property>
1431- <property name="justify">center</property>
1432- </widget>
1433- <packing>
1434- <property name="position">1</property>
1435- </packing>
1436- </child>
1437- </widget>
1438- <packing>
1439- <property name="fill">False</property>
1440- <property name="position">0</property>
1441- </packing>
1442- </child>
1443- <child>
1444- <widget class="GtkLabel" id="label17">
1445- <property name="visible">True</property>
1446- <property name="xalign">0</property>
1447- <property name="label" translatable="yes">Brought to you by:</property>
1448- </widget>
1449- <packing>
1450- <property name="expand">False</property>
1451- <property name="fill">False</property>
1452- <property name="position">1</property>
1453- </packing>
1454- </child>
1455- <child>
1456- <widget class="GtkLabel" id="label18">
1457- <property name="visible">True</property>
1458- <property name="xalign">0</property>
1459- <property name="xpad">12</property>
1460- <property name="label" translatable="yes">Stuart Langridge - sil-launchpad@kryogenix.org
1461-David Corrales - corrales.david@gmail.com</property>
1462- </widget>
1463- <packing>
1464- <property name="expand">False</property>
1465- <property name="fill">False</property>
1466- <property name="position">2</property>
1467- </packing>
1468- </child>
1469- <child>
1470- <widget class="GtkLabel" id="label19">
1471- <property name="visible">True</property>
1472- <property name="xalign">0</property>
1473- <property name="label" translatable="yes">Additional thanks to:</property>
1474- </widget>
1475- <packing>
1476- <property name="expand">False</property>
1477- <property name="fill">False</property>
1478- <property name="position">3</property>
1479- </packing>
1480- </child>
1481- <child>
1482- <widget class="GtkLabel" id="label20">
1483- <property name="visible">True</property>
1484- <property name="xalign">0</property>
1485- <property name="xpad">12</property>
1486- <property name="label" translatable="yes">The Aldrin Development Team - for their Freesound XML API implementation.</property>
1487- </widget>
1488- <packing>
1489- <property name="expand">False</property>
1490- <property name="fill">False</property>
1491- <property name="position">4</property>
1492- </packing>
1493- </child>
1494- <child>
1495- <widget class="GtkLabel" id="label16">
1496- <property name="visible">True</property>
1497- <property name="label" translatable="yes">This software is licensed under the GNU GPL license.
1498-Please refer to the main Jokosher COPYING file for more details.</property>
1499- <property name="wrap">True</property>
1500- </widget>
1501- <packing>
1502- <property name="position">5</property>
1503- </packing>
1504- </child>
1505- </widget>
1506- <packing>
1507- <property name="position">2</property>
1508- </packing>
1509- </child>
1510- <child>
1511- <widget class="GtkLabel" id="label11">
1512- <property name="visible">True</property>
1513- <property name="label" translatable="yes">About</property>
1514- </widget>
1515- <packing>
1516- <property name="position">2</property>
1517- <property name="tab_fill">False</property>
1518- <property name="type">tab</property>
1519- </packing>
1520- </child>
1521- </widget>
1522- <packing>
1523- <property name="position">1</property>
1524- </packing>
1525- </child>
1526- <child>
1527- <widget class="GtkHBox" id="hboxMainButtons">
1528- <property name="visible">True</property>
1529- <child>
1530- <widget class="GtkLabel" id="label8">
1531- <property name="visible">True</property>
1532- </widget>
1533- <packing>
1534- <property name="fill">False</property>
1535- <property name="position">0</property>
1536- </packing>
1537- </child>
1538- <child>
1539- <widget class="GtkButton" id="buttonClose">
1540- <property name="label">gtk-close</property>
1541- <property name="visible">True</property>
1542- <property name="can_focus">True</property>
1543- <property name="receives_default">False</property>
1544- <property name="tooltip" translatable="yes">Close this window</property>
1545- <property name="use_stock">True</property>
1546- <signal name="clicked" handler="on_buttonClose_clicked"/>
1547- </widget>
1548- <packing>
1549- <property name="expand">False</property>
1550- <property name="fill">False</property>
1551- <property name="padding">12</property>
1552- <property name="position">1</property>
1553- </packing>
1554- </child>
1555- </widget>
1556- <packing>
1557- <property name="expand">False</property>
1558- <property name="fill">False</property>
1559- <property name="position">2</property>
1560- </packing>
1561- </child>
1562- <child>
1563- <widget class="GtkStatusbar" id="statusbar">
1564- <property name="visible">True</property>
1565- </widget>
1566- <packing>
1567- <property name="expand">False</property>
1568- <property name="fill">False</property>
1569- <property name="position">3</property>
1570- </packing>
1571- </child>
1572- </widget>
1573- </child>
1574- </widget>
1575- <widget class="GtkDialog" id="LoginDetailsDialog">
1576- <property name="visible">True</property>
1577- <property name="title" translatable="yes">Set Freesound Details</property>
1578- <property name="modal">True</property>
1579- <property name="type_hint">dialog</property>
1580- <property name="has_separator">False</property>
1581- <child internal-child="vbox">
1582- <widget class="GtkVBox" id="dialog-vbox1">
1583- <property name="visible">True</property>
1584- <child>
1585- <widget class="GtkVBox" id="vbox5">
1586- <property name="visible">True</property>
1587- <property name="spacing">6</property>
1588- <child>
1589- <widget class="GtkFrame" id="frame2">
1590- <property name="visible">True</property>
1591- <property name="label_xalign">0</property>
1592- <property name="shadow_type">none</property>
1593- <child>
1594- <widget class="GtkAlignment" id="alignment3">
1595- <property name="visible">True</property>
1596- <property name="left_padding">12</property>
1597- <property name="right_padding">6</property>
1598- <child>
1599- <widget class="GtkTable" id="tableDetails">
1600- <property name="visible">True</property>
1601- <property name="n_rows">2</property>
1602- <property name="n_columns">2</property>
1603- <property name="column_spacing">6</property>
1604- <property name="row_spacing">6</property>
1605- <child>
1606- <widget class="GtkLabel" id="label22">
1607- <property name="visible">True</property>
1608- <property name="xalign">0</property>
1609- <property name="label" translatable="yes">Username</property>
1610- </widget>
1611- <packing>
1612- <property name="x_options">GTK_FILL</property>
1613- <property name="y_options"></property>
1614- </packing>
1615- </child>
1616- <child>
1617- <widget class="GtkLabel" id="label23">
1618- <property name="visible">True</property>
1619- <property name="xalign">0</property>
1620- <property name="label" translatable="yes">Password</property>
1621- </widget>
1622- <packing>
1623- <property name="top_attach">1</property>
1624- <property name="bottom_attach">2</property>
1625- <property name="x_options">GTK_FILL</property>
1626- <property name="y_options"></property>
1627- </packing>
1628- </child>
1629- <child>
1630- <widget class="GtkEntry" id="entryPassword">
1631- <property name="visible">True</property>
1632- <property name="can_focus">True</property>
1633- <property name="visibility">False</property>
1634- <property name="invisible_char">&#x25CF;</property>
1635- </widget>
1636- <packing>
1637- <property name="left_attach">1</property>
1638- <property name="right_attach">2</property>
1639- <property name="top_attach">1</property>
1640- <property name="bottom_attach">2</property>
1641- <property name="y_options"></property>
1642- </packing>
1643- </child>
1644- <child>
1645- <widget class="GtkEntry" id="entryUsername">
1646- <property name="visible">True</property>
1647- <property name="can_focus">True</property>
1648- <property name="invisible_char">&#x25CF;</property>
1649- </widget>
1650- <packing>
1651- <property name="left_attach">1</property>
1652- <property name="right_attach">2</property>
1653- <property name="y_options"></property>
1654- </packing>
1655- </child>
1656- </widget>
1657- </child>
1658- </widget>
1659- </child>
1660- <child>
1661- <widget class="GtkLabel" id="label24">
1662- <property name="visible">True</property>
1663- <property name="ypad">6</property>
1664- <property name="label" translatable="yes">&lt;b&gt;Freesound account&lt;/b&gt;</property>
1665- <property name="use_markup">True</property>
1666- </widget>
1667- <packing>
1668- <property name="type">label_item</property>
1669- </packing>
1670- </child>
1671- </widget>
1672- <packing>
1673- <property name="expand">False</property>
1674- <property name="fill">False</property>
1675- <property name="position">0</property>
1676- </packing>
1677- </child>
1678- </widget>
1679- <packing>
1680- <property name="position">1</property>
1681- </packing>
1682- </child>
1683- <child>
1684- <widget class="GtkLinkButton" id="linkCreateAccount">
1685- <property name="label" translatable="yes">Create new account</property>
1686- <property name="visible">True</property>
1687- <property name="can_focus">True</property>
1688- <property name="receives_default">True</property>
1689- <property name="has_tooltip">True</property>
1690- <property name="relief">none</property>
1691- <property name="uri">http://www.freesound.org/forum/profile.php?mode=register</property>
1692- </widget>
1693- <packing>
1694- <property name="padding">5</property>
1695- <property name="position">2</property>
1696- </packing>
1697- </child>
1698- <child>
1699- <widget class="GtkLabel" id="labelWarning">
1700- <property name="visible">True</property>
1701- <property name="use_markup">True</property>
1702- </widget>
1703- <packing>
1704- <property name="expand">False</property>
1705- <property name="fill">False</property>
1706- <property name="position">3</property>
1707- </packing>
1708- </child>
1709- <child internal-child="action_area">
1710- <widget class="GtkHButtonBox" id="dialog-action_area1">
1711- <property name="visible">True</property>
1712- <property name="layout_style">end</property>
1713- <child>
1714- <widget class="GtkButton" id="buttonCancel">
1715- <property name="label">gtk-cancel</property>
1716- <property name="response_id">-6</property>
1717- <property name="visible">True</property>
1718- <property name="can_focus">True</property>
1719- <property name="can_default">True</property>
1720- <property name="receives_default">False</property>
1721- <property name="use_stock">True</property>
1722- <signal name="clicked" handler="on_buttonCancel_clicked"/>
1723- </widget>
1724- <packing>
1725- <property name="expand">False</property>
1726- <property name="fill">False</property>
1727- <property name="position">0</property>
1728- </packing>
1729- </child>
1730- <child>
1731- <widget class="GtkButton" id="buttonOK">
1732- <property name="label">gtk-ok</property>
1733- <property name="response_id">-5</property>
1734- <property name="visible">True</property>
1735- <property name="can_focus">True</property>
1736- <property name="can_default">True</property>
1737- <property name="receives_default">False</property>
1738- <property name="use_stock">True</property>
1739- <signal name="clicked" handler="on_buttonOK_clicked"/>
1740- </widget>
1741- <packing>
1742- <property name="expand">False</property>
1743- <property name="fill">False</property>
1744- <property name="position">1</property>
1745- </packing>
1746- </child>
1747- </widget>
1748- <packing>
1749- <property name="expand">False</property>
1750- <property name="pack_type">end</property>
1751- <property name="position">0</property>
1752- </packing>
1753- </child>
1754- </widget>
1755- </child>
1756- </widget>
1757-</glade-interface>
1758
1759=== removed file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.gladep'
1760--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.gladep 2007-01-30 03:29:02 +0000
1761+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.gladep 1970-01-01 00:00:00 +0000
1762@@ -1,8 +0,0 @@
1763-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
1764-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
1765-
1766-<glade-project>
1767- <name></name>
1768- <program_name></program_name>
1769- <gnome_support>FALSE</gnome_support>
1770-</glade-project>
1771
1772=== modified file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.py'
1773--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2010-07-16 15:12:23 +0000
1774+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.py 2011-02-28 22:41:14 +0000
1775@@ -10,7 +10,7 @@
1776 import Jokosher.Extension # required in all Jokosher extensions
1777 import pygtk
1778 pygtk.require("2.0")
1779-import gtk, gtk.glade, gobject
1780+import gtk, gobject
1781 import pygst
1782 pygst.require("0.10")
1783 import gst
1784@@ -42,7 +42,7 @@
1785
1786 # necessary extension attributes
1787 EXTENSION_NAME = _("Freesound search")
1788- EXTENSION_VERSION = "0.4"
1789+ EXTENSION_VERSION = "0.11"
1790 EXTENSION_DESCRIPTION = _("Searches the Freesound library of freely" + \
1791 " licenceable and useable sound clips")
1792
1793@@ -101,8 +101,9 @@
1794 self.LoginDetails()
1795 return
1796
1797- xmlString = pkg_resources.resource_string(__name__, "FreesoundSearch.glade")
1798- wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString), "FreesoundSearchWindow")
1799+ xmlString = pkg_resources.resource_string(__name__, "FreesoundSearch.ui")
1800+ gtkBuilder = gtk.Builder()
1801+ gtkBuilder.add_from_string(xmlString)
1802
1803 signals = {
1804 "on_buttonFind_clicked" : self.OnFind,
1805@@ -112,21 +113,21 @@
1806 "on_buttonDelete_clicked" : self.OnDelete,
1807 "on_buttonCopy_clicked" : self.OnCopy
1808 }
1809- wTree.signal_autoconnect(signals)
1810+ gtkBuilder.connect_signals(signals)
1811
1812- self.entryFind = wTree.get_widget("entryFind")
1813- self.buttonFind = wTree.get_widget("buttonFind")
1814- self.scrollResults = wTree.get_widget("scrolledwindowResults")
1815- self.statusbar = wTree.get_widget("statusbar")
1816- self.imageHeader = wTree.get_widget("imageHeader")
1817- self.eventBoxHeader = wTree.get_widget("eventboxHeader")
1818- self.checkDescriptions = wTree.get_widget("checkbuttonDescriptions")
1819- self.checkTags = wTree.get_widget("checkbuttonTags")
1820- self.checkFilenames = wTree.get_widget("checkbuttonFilenames")
1821- self.checkUsernames = wTree.get_widget("checkbuttonUsernames")
1822- self.spinResults = wTree.get_widget("spinbuttonResults")
1823- self.window = wTree.get_widget("FreesoundSearchWindow")
1824- self.treeHistory = wTree.get_widget("treeviewHistory")
1825+ self.entryFind = gtkBuilder.get_object("entryFind")
1826+ self.buttonFind = gtkBuilder.get_object("buttonFind")
1827+ self.scrollResults = gtkBuilder.get_object("scrolledwindowResults")
1828+ self.statusbar = gtkBuilder.get_object("statusbar")
1829+ self.imageHeader = gtkBuilder.get_object("imageHeader")
1830+ self.eventBoxHeader = gtkBuilder.get_object("eventboxHeader")
1831+ self.checkDescriptions = gtkBuilder.get_object("checkbuttonDescriptions")
1832+ self.checkTags = gtkBuilder.get_object("checkbuttonTags")
1833+ self.checkFilenames = gtkBuilder.get_object("checkbuttonFilenames")
1834+ self.checkUsernames = gtkBuilder.get_object("checkbuttonUsernames")
1835+ self.spinResults = gtkBuilder.get_object("spinbuttonResults")
1836+ self.window = gtkBuilder.get_object("FreesoundSearchWindow")
1837+ self.treeHistory = gtkBuilder.get_object("treeviewHistory")
1838 self.vboxResults = gtk.VBox(spacing=6)
1839 self.clipboard = gtk.Clipboard()
1840
1841@@ -347,20 +348,21 @@
1842 Parameters:
1843 warning -- True if the validation failed and the user must be informed.
1844 """
1845- xmlString = pkg_resources.resource_string(__name__, "FreesoundSearch.glade")
1846- wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString), "LoginDetailsDialog")
1847+ xmlString = pkg_resources.resource_string(__name__, "LoginDialog.ui")
1848+ gtkBuilder = gtk.Builder()
1849+ gtkBuilder.add_from_string(xmlString)
1850
1851 signals = {
1852 "on_buttonOK_clicked" : self.OnAcceptDetails,
1853 "on_buttonCancel_clicked" : self.OnCancelDetails
1854 }
1855- wTree.signal_autoconnect(signals)
1856+ gtkBuilder.connect_signals(signals)
1857
1858- self.entryUsername = wTree.get_widget("entryUsername")
1859- self.entryPassword = wTree.get_widget("entryPassword")
1860- self.labelWarning = wTree.get_widget("labelWarning")
1861- self.buttonOK = wTree.get_widget("buttonOK")
1862- self.loginWindow = wTree.get_widget("LoginDetailsDialog")
1863+ self.entryUsername = gtkBuilder.get_object("entryUsername")
1864+ self.entryPassword = gtkBuilder.get_object("entryPassword")
1865+ self.labelWarning = gtkBuilder.get_object("labelWarning")
1866+ self.buttonOK = gtkBuilder.get_object("buttonOK")
1867+ self.loginWindow = gtkBuilder.get_object("LoginDetailsDialog")
1868
1869 self.entryUsername.set_activates_default(True)
1870 self.entryPassword.set_activates_default(True)
1871@@ -729,17 +731,16 @@
1872 Parameter:
1873 sample -- sample whose preview image shoud be fetched.
1874 """
1875- tmpnam = os.tmpnam()
1876 try:
1877- imgfile = urllib.urlretrieve(sample.image, tmpnam)
1878+ imgfile = urllib.urlretrieve(sample.image)[0]
1879 except:
1880 # TODO: handle the url problems
1881 return
1882-
1883+
1884 image = gtk.Image()
1885- image.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(tmpnam, 50, 50))
1886+ image.set_from_pixbuf(gtk.gdk.pixbuf_new_from_file_at_size(imgfile, 50, 50))
1887 sample.image = image
1888- os.unlink(tmpnam)
1889+ os.unlink(imgfile)
1890
1891 #_____________________________________________________________________
1892
1893
1894=== added file 'extensions/eggs/FreesoundSearch/src/FreesoundSearch.ui'
1895--- extensions/eggs/FreesoundSearch/src/FreesoundSearch.ui 1970-01-01 00:00:00 +0000
1896+++ extensions/eggs/FreesoundSearch/src/FreesoundSearch.ui 2011-02-28 22:41:14 +0000
1897@@ -0,0 +1,570 @@
1898+<?xml version="1.0" encoding="UTF-8"?>
1899+<interface>
1900+ <requires lib="gtk+" version="2.16"/>
1901+ <!-- interface-naming-policy toplevel-contextual -->
1902+ <object class="GtkWindow" id="FreesoundSearchWindow">
1903+ <property name="visible">True</property>
1904+ <property name="title" translatable="yes">Search Freesound</property>
1905+ <property name="window_position">center</property>
1906+ <property name="default_width">620</property>
1907+ <property name="default_height">450</property>
1908+ <signal name="destroy" handler="on_destroy"/>
1909+ <child>
1910+ <object class="GtkVBox" id="vboxMain">
1911+ <property name="visible">True</property>
1912+ <property name="spacing">6</property>
1913+ <child>
1914+ <object class="GtkEventBox" id="eventboxHeader">
1915+ <property name="visible">True</property>
1916+ <child>
1917+ <object class="GtkImage" id="imageHeader">
1918+ <property name="visible">True</property>
1919+ </object>
1920+ </child>
1921+ </object>
1922+ <packing>
1923+ <property name="expand">False</property>
1924+ <property name="position">0</property>
1925+ </packing>
1926+ </child>
1927+ <child>
1928+ <object class="GtkNotebook" id="notebook">
1929+ <property name="visible">True</property>
1930+ <property name="can_focus">True</property>
1931+ <property name="border_width">13</property>
1932+ <child>
1933+ <object class="GtkVBox" id="vboxQuery">
1934+ <property name="visible">True</property>
1935+ <property name="border_width">12</property>
1936+ <property name="spacing">6</property>
1937+ <child>
1938+ <object class="GtkLabel" id="label1">
1939+ <property name="visible">True</property>
1940+ <property name="xalign">0</property>
1941+ <property name="label" translatable="yes">Search the Freesound library samples.
1942+
1943+&lt;b&gt;Drag and drop&lt;/b&gt; samples on to your project to add them.</property>
1944+ <property name="use_markup">True</property>
1945+ </object>
1946+ <packing>
1947+ <property name="expand">False</property>
1948+ <property name="fill">False</property>
1949+ <property name="position">0</property>
1950+ </packing>
1951+ </child>
1952+ <child>
1953+ <object class="GtkHBox" id="hboxFind">
1954+ <property name="visible">True</property>
1955+ <property name="spacing">6</property>
1956+ <child>
1957+ <object class="GtkEntry" id="entryFind">
1958+ <property name="visible">True</property>
1959+ <property name="can_focus">True</property>
1960+ <property name="invisible_char">●</property>
1961+ <property name="text" translatable="yes">Type your query here then press "Find"</property>
1962+ </object>
1963+ <packing>
1964+ <property name="position">0</property>
1965+ </packing>
1966+ </child>
1967+ <child>
1968+ <object class="GtkButton" id="buttonFind">
1969+ <property name="visible">True</property>
1970+ <property name="can_focus">True</property>
1971+ <property name="receives_default">False</property>
1972+ <signal name="clicked" handler="on_buttonFind_clicked"/>
1973+ <child>
1974+ <object class="GtkAlignment" id="alignment2">
1975+ <property name="visible">True</property>
1976+ <property name="xscale">0</property>
1977+ <property name="yscale">0</property>
1978+ <child>
1979+ <object class="GtkHBox" id="hbox4">
1980+ <property name="visible">True</property>
1981+ <property name="spacing">2</property>
1982+ <child>
1983+ <object class="GtkImage" id="image3">
1984+ <property name="visible">True</property>
1985+ <property name="stock">gtk-find</property>
1986+ </object>
1987+ <packing>
1988+ <property name="expand">False</property>
1989+ <property name="fill">False</property>
1990+ <property name="position">0</property>
1991+ </packing>
1992+ </child>
1993+ <child>
1994+ <object class="GtkLabel" id="label21">
1995+ <property name="visible">True</property>
1996+ <property name="label">_Find</property>
1997+ <property name="use_underline">True</property>
1998+ </object>
1999+ <packing>
2000+ <property name="expand">False</property>
2001+ <property name="fill">False</property>
2002+ <property name="position">1</property>
2003+ </packing>
2004+ </child>
2005+ </object>
2006+ </child>
2007+ </object>
2008+ </child>
2009+ </object>
2010+ <packing>
2011+ <property name="expand">False</property>
2012+ <property name="fill">False</property>
2013+ <property name="position">1</property>
2014+ </packing>
2015+ </child>
2016+ </object>
2017+ <packing>
2018+ <property name="expand">False</property>
2019+ <property name="position">1</property>
2020+ </packing>
2021+ </child>
2022+ <child>
2023+ <object class="GtkExpander" id="expander">
2024+ <property name="visible">True</property>
2025+ <property name="can_focus">True</property>
2026+ <property name="spacing">6</property>
2027+ <child>
2028+ <object class="GtkVBox" id="vbox4">
2029+ <property name="visible">True</property>
2030+ <property name="spacing">7</property>
2031+ <child>
2032+ <object class="GtkHBox" id="hboxOptions">
2033+ <property name="visible">True</property>
2034+ <property name="spacing">6</property>
2035+ <child>
2036+ <object class="GtkLabel" id="label9">
2037+ <property name="visible">True</property>
2038+ <property name="label" translatable="yes">Search in:</property>
2039+ </object>
2040+ <packing>
2041+ <property name="expand">False</property>
2042+ <property name="fill">False</property>
2043+ <property name="position">0</property>
2044+ </packing>
2045+ </child>
2046+ <child>
2047+ <object class="GtkCheckButton" id="checkbuttonDescriptions">
2048+ <property name="label" translatable="yes">Descriptions</property>
2049+ <property name="visible">True</property>
2050+ <property name="can_focus">True</property>
2051+ <property name="receives_default">False</property>
2052+ <property name="use_underline">True</property>
2053+ <property name="active">True</property>
2054+ <property name="draw_indicator">True</property>
2055+ </object>
2056+ <packing>
2057+ <property name="expand">False</property>
2058+ <property name="fill">False</property>
2059+ <property name="position">1</property>
2060+ </packing>
2061+ </child>
2062+ <child>
2063+ <object class="GtkCheckButton" id="checkbuttonTags">
2064+ <property name="label" translatable="yes">Tags</property>
2065+ <property name="visible">True</property>
2066+ <property name="can_focus">True</property>
2067+ <property name="receives_default">False</property>
2068+ <property name="use_underline">True</property>
2069+ <property name="active">True</property>
2070+ <property name="draw_indicator">True</property>
2071+ </object>
2072+ <packing>
2073+ <property name="expand">False</property>
2074+ <property name="fill">False</property>
2075+ <property name="position">2</property>
2076+ </packing>
2077+ </child>
2078+ <child>
2079+ <object class="GtkCheckButton" id="checkbuttonFilenames">
2080+ <property name="label" translatable="yes">Filenames</property>
2081+ <property name="visible">True</property>
2082+ <property name="can_focus">True</property>
2083+ <property name="receives_default">False</property>
2084+ <property name="use_underline">True</property>
2085+ <property name="draw_indicator">True</property>
2086+ </object>
2087+ <packing>
2088+ <property name="expand">False</property>
2089+ <property name="fill">False</property>
2090+ <property name="position">3</property>
2091+ </packing>
2092+ </child>
2093+ <child>
2094+ <object class="GtkCheckButton" id="checkbuttonUsernames">
2095+ <property name="label" translatable="yes">Usernames</property>
2096+ <property name="visible">True</property>
2097+ <property name="can_focus">True</property>
2098+ <property name="receives_default">False</property>
2099+ <property name="use_underline">True</property>
2100+ <property name="draw_indicator">True</property>
2101+ </object>
2102+ <packing>
2103+ <property name="expand">False</property>
2104+ <property name="fill">False</property>
2105+ <property name="position">4</property>
2106+ </packing>
2107+ </child>
2108+ </object>
2109+ <packing>
2110+ <property name="position">0</property>
2111+ </packing>
2112+ </child>
2113+ <child>
2114+ <object class="GtkHBox" id="hbox1">
2115+ <property name="visible">True</property>
2116+ <property name="spacing">6</property>
2117+ <child>
2118+ <object class="GtkLabel" id="label10">
2119+ <property name="visible">True</property>
2120+ <property name="label" translatable="yes">Maximum number of results:</property>
2121+ </object>
2122+ <packing>
2123+ <property name="expand">False</property>
2124+ <property name="fill">False</property>
2125+ <property name="position">0</property>
2126+ </packing>
2127+ </child>
2128+ <child>
2129+ <object class="GtkSpinButton" id="spinbuttonResults">
2130+ <property name="visible">True</property>
2131+ <property name="can_focus">True</property>
2132+ <property name="adjustment">adjustment1</property>
2133+ <property name="climb_rate">1</property>
2134+ <property name="numeric">True</property>
2135+ <signal name="value_changed" handler="on_spinbuttonResults_value_changed"/>
2136+ </object>
2137+ <packing>
2138+ <property name="expand">False</property>
2139+ <property name="position">1</property>
2140+ </packing>
2141+ </child>
2142+ </object>
2143+ <packing>
2144+ <property name="position">1</property>
2145+ </packing>
2146+ </child>
2147+ </object>
2148+ </child>
2149+ <child type="label">
2150+ <object class="GtkLabel" id="label2">
2151+ <property name="visible">True</property>
2152+ <property name="label" translatable="yes">Advanced search options</property>
2153+ </object>
2154+ </child>
2155+ </object>
2156+ <packing>
2157+ <property name="expand">False</property>
2158+ <property name="position">2</property>
2159+ </packing>
2160+ </child>
2161+ <child>
2162+ <object class="GtkScrolledWindow" id="scrolledwindowResults">
2163+ <property name="visible">True</property>
2164+ <property name="can_focus">True</property>
2165+ <property name="hscrollbar_policy">automatic</property>
2166+ <property name="vscrollbar_policy">automatic</property>
2167+ <child>
2168+ <object class="GtkViewport" id="viewport">
2169+ <property name="visible">True</property>
2170+ <child>
2171+ <placeholder/>
2172+ </child>
2173+ </object>
2174+ </child>
2175+ </object>
2176+ <packing>
2177+ <property name="position">3</property>
2178+ </packing>
2179+ </child>
2180+ </object>
2181+ </child>
2182+ <child type="tab">
2183+ <object class="GtkLabel" id="label3">
2184+ <property name="visible">True</property>
2185+ <property name="label" translatable="yes">Search</property>
2186+ </object>
2187+ <packing>
2188+ <property name="tab_fill">False</property>
2189+ </packing>
2190+ </child>
2191+ <child>
2192+ <object class="GtkVBox" id="vboxHistory">
2193+ <property name="visible">True</property>
2194+ <property name="border_width">12</property>
2195+ <property name="spacing">6</property>
2196+ <child>
2197+ <object class="GtkLabel" id="label12">
2198+ <property name="visible">True</property>
2199+ <property name="xalign">0</property>
2200+ <property name="label" translatable="yes">Browse your used sample history</property>
2201+ </object>
2202+ <packing>
2203+ <property name="expand">False</property>
2204+ <property name="fill">False</property>
2205+ <property name="position">0</property>
2206+ </packing>
2207+ </child>
2208+ <child>
2209+ <object class="GtkScrolledWindow" id="scrolledwindow">
2210+ <property name="visible">True</property>
2211+ <property name="can_focus">True</property>
2212+ <property name="hscrollbar_policy">automatic</property>
2213+ <property name="vscrollbar_policy">automatic</property>
2214+ <property name="shadow_type">in</property>
2215+ <child>
2216+ <object class="GtkTreeView" id="treeviewHistory">
2217+ <property name="visible">True</property>
2218+ <property name="can_focus">True</property>
2219+ <property name="headers_visible">False</property>
2220+ </object>
2221+ </child>
2222+ </object>
2223+ <packing>
2224+ <property name="position">1</property>
2225+ </packing>
2226+ </child>
2227+ <child>
2228+ <object class="GtkHBox" id="hboxHistoryButtons">
2229+ <property name="visible">True</property>
2230+ <property name="spacing">6</property>
2231+ <child>
2232+ <object class="GtkLabel" id="label13">
2233+ <property name="visible">True</property>
2234+ </object>
2235+ <packing>
2236+ <property name="position">0</property>
2237+ </packing>
2238+ </child>
2239+ <child>
2240+ <object class="GtkButton" id="buttonDelete">
2241+ <property name="label">gtk-delete</property>
2242+ <property name="visible">True</property>
2243+ <property name="can_focus">True</property>
2244+ <property name="receives_default">False</property>
2245+ <property name="use_stock">True</property>
2246+ <signal name="clicked" handler="on_buttonDelete_clicked"/>
2247+ </object>
2248+ <packing>
2249+ <property name="expand">False</property>
2250+ <property name="fill">False</property>
2251+ <property name="position">1</property>
2252+ </packing>
2253+ </child>
2254+ <child>
2255+ <object class="GtkButton" id="buttonCopy">
2256+ <property name="label">gtk-copy</property>
2257+ <property name="visible">True</property>
2258+ <property name="can_focus">True</property>
2259+ <property name="receives_default">False</property>
2260+ <property name="use_stock">True</property>
2261+ <signal name="clicked" handler="on_buttonCopy_clicked"/>
2262+ </object>
2263+ <packing>
2264+ <property name="expand">False</property>
2265+ <property name="fill">False</property>
2266+ <property name="position">2</property>
2267+ </packing>
2268+ </child>
2269+ </object>
2270+ <packing>
2271+ <property name="expand">False</property>
2272+ <property name="position">2</property>
2273+ </packing>
2274+ </child>
2275+ </object>
2276+ <packing>
2277+ <property name="position">1</property>
2278+ </packing>
2279+ </child>
2280+ <child type="tab">
2281+ <object class="GtkLabel" id="label4">
2282+ <property name="visible">True</property>
2283+ <property name="label" translatable="yes">History</property>
2284+ </object>
2285+ <packing>
2286+ <property name="position">1</property>
2287+ <property name="tab_fill">False</property>
2288+ </packing>
2289+ </child>
2290+ <child>
2291+ <object class="GtkVBox" id="vboxAbout">
2292+ <property name="visible">True</property>
2293+ <property name="border_width">12</property>
2294+ <property name="spacing">6</property>
2295+ <child>
2296+ <object class="GtkHBox" id="hbox3">
2297+ <property name="visible">True</property>
2298+ <property name="spacing">6</property>
2299+ <child>
2300+ <object class="GtkImage" id="image2">
2301+ <property name="visible">True</property>
2302+ <property name="xalign">1</property>
2303+ <property name="yalign">0</property>
2304+ <property name="stock">gtk-about</property>
2305+ </object>
2306+ <packing>
2307+ <property name="position">0</property>
2308+ </packing>
2309+ </child>
2310+ <child>
2311+ <object class="GtkLabel" id="label14">
2312+ <property name="visible">True</property>
2313+ <property name="xalign">0</property>
2314+ <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Jokosher Freesound Extension&lt;/b&gt;&lt;/big&gt;
2315+version 0.11</property>
2316+ <property name="use_markup">True</property>
2317+ <property name="justify">center</property>
2318+ </object>
2319+ <packing>
2320+ <property name="position">1</property>
2321+ </packing>
2322+ </child>
2323+ </object>
2324+ <packing>
2325+ <property name="fill">False</property>
2326+ <property name="position">0</property>
2327+ </packing>
2328+ </child>
2329+ <child>
2330+ <object class="GtkLabel" id="label17">
2331+ <property name="visible">True</property>
2332+ <property name="xalign">0</property>
2333+ <property name="label" translatable="yes">Brought to you by:</property>
2334+ </object>
2335+ <packing>
2336+ <property name="expand">False</property>
2337+ <property name="fill">False</property>
2338+ <property name="position">1</property>
2339+ </packing>
2340+ </child>
2341+ <child>
2342+ <object class="GtkLabel" id="label18">
2343+ <property name="visible">True</property>
2344+ <property name="xalign">0</property>
2345+ <property name="xpad">12</property>
2346+ <property name="label" translatable="yes">Stuart Langridge - sil-launchpad@kryogenix.org
2347+David Corrales - corrales.david@gmail.com</property>
2348+ </object>
2349+ <packing>
2350+ <property name="expand">False</property>
2351+ <property name="fill">False</property>
2352+ <property name="position">2</property>
2353+ </packing>
2354+ </child>
2355+ <child>
2356+ <object class="GtkLabel" id="label19">
2357+ <property name="visible">True</property>
2358+ <property name="xalign">0</property>
2359+ <property name="label" translatable="yes">Additional thanks to:</property>
2360+ </object>
2361+ <packing>
2362+ <property name="expand">False</property>
2363+ <property name="fill">False</property>
2364+ <property name="position">3</property>
2365+ </packing>
2366+ </child>
2367+ <child>
2368+ <object class="GtkLabel" id="label20">
2369+ <property name="visible">True</property>
2370+ <property name="xalign">0</property>
2371+ <property name="xpad">12</property>
2372+ <property name="label" translatable="yes">The Aldrin Development Team - for their Freesound XML API implementation.</property>
2373+ </object>
2374+ <packing>
2375+ <property name="expand">False</property>
2376+ <property name="fill">False</property>
2377+ <property name="position">4</property>
2378+ </packing>
2379+ </child>
2380+ <child>
2381+ <object class="GtkLabel" id="label16">
2382+ <property name="visible">True</property>
2383+ <property name="label" translatable="yes">This software is licensed under the GNU GPL license.
2384+Please refer to the main Jokosher COPYING file for more details.</property>
2385+ <property name="wrap">True</property>
2386+ </object>
2387+ <packing>
2388+ <property name="position">5</property>
2389+ </packing>
2390+ </child>
2391+ </object>
2392+ <packing>
2393+ <property name="position">2</property>
2394+ </packing>
2395+ </child>
2396+ <child type="tab">
2397+ <object class="GtkLabel" id="label11">
2398+ <property name="visible">True</property>
2399+ <property name="label" translatable="yes">About</property>
2400+ </object>
2401+ <packing>
2402+ <property name="position">2</property>
2403+ <property name="tab_fill">False</property>
2404+ </packing>
2405+ </child>
2406+ </object>
2407+ <packing>
2408+ <property name="position">1</property>
2409+ </packing>
2410+ </child>
2411+ <child>
2412+ <object class="GtkHBox" id="hboxMainButtons">
2413+ <property name="visible">True</property>
2414+ <child>
2415+ <object class="GtkLabel" id="label8">
2416+ <property name="visible">True</property>
2417+ </object>
2418+ <packing>
2419+ <property name="fill">False</property>
2420+ <property name="position">0</property>
2421+ </packing>
2422+ </child>
2423+ <child>
2424+ <object class="GtkButton" id="buttonClose">
2425+ <property name="label">gtk-close</property>
2426+ <property name="visible">True</property>
2427+ <property name="can_focus">True</property>
2428+ <property name="receives_default">False</property>
2429+ <property name="use_stock">True</property>
2430+ <signal name="clicked" handler="on_buttonClose_clicked"/>
2431+ </object>
2432+ <packing>
2433+ <property name="expand">False</property>
2434+ <property name="fill">False</property>
2435+ <property name="padding">12</property>
2436+ <property name="position">1</property>
2437+ </packing>
2438+ </child>
2439+ </object>
2440+ <packing>
2441+ <property name="expand">False</property>
2442+ <property name="fill">False</property>
2443+ <property name="position">2</property>
2444+ </packing>
2445+ </child>
2446+ <child>
2447+ <object class="GtkStatusbar" id="statusbar">
2448+ <property name="visible">True</property>
2449+ </object>
2450+ <packing>
2451+ <property name="expand">False</property>
2452+ <property name="fill">False</property>
2453+ <property name="position">3</property>
2454+ </packing>
2455+ </child>
2456+ </object>
2457+ </child>
2458+ </object>
2459+ <object class="GtkAdjustment" id="adjustment1">
2460+ <property name="value">15</property>
2461+ <property name="lower">1</property>
2462+ <property name="upper">100</property>
2463+ <property name="step_increment">1</property>
2464+ <property name="page_increment">10</property>
2465+ <property name="page_size">0</property>
2466+ </object>
2467+</interface>
2468
2469=== added file 'extensions/eggs/FreesoundSearch/src/LoginDialog.ui'
2470--- extensions/eggs/FreesoundSearch/src/LoginDialog.ui 1970-01-01 00:00:00 +0000
2471+++ extensions/eggs/FreesoundSearch/src/LoginDialog.ui 2011-02-28 22:41:14 +0000
2472@@ -0,0 +1,184 @@
2473+<?xml version="1.0" encoding="UTF-8"?>
2474+<interface>
2475+ <requires lib="gtk+" version="2.16"/>
2476+ <!-- interface-naming-policy toplevel-contextual -->
2477+ <object class="GtkDialog" id="LoginDetailsDialog">
2478+ <property name="visible">True</property>
2479+ <property name="title" translatable="yes">Set Freesound Details</property>
2480+ <property name="modal">True</property>
2481+ <property name="type_hint">dialog</property>
2482+ <child internal-child="vbox">
2483+ <object class="GtkVBox" id="dialog-vbox1">
2484+ <property name="visible">True</property>
2485+ <child>
2486+ <object class="GtkVBox" id="vbox5">
2487+ <property name="visible">True</property>
2488+ <property name="spacing">6</property>
2489+ <child>
2490+ <object class="GtkFrame" id="frame2">
2491+ <property name="visible">True</property>
2492+ <property name="label_xalign">0</property>
2493+ <property name="shadow_type">none</property>
2494+ <child>
2495+ <object class="GtkAlignment" id="alignment3">
2496+ <property name="visible">True</property>
2497+ <property name="left_padding">12</property>
2498+ <property name="right_padding">6</property>
2499+ <child>
2500+ <object class="GtkTable" id="tableDetails">
2501+ <property name="visible">True</property>
2502+ <property name="n_rows">2</property>
2503+ <property name="n_columns">2</property>
2504+ <property name="column_spacing">6</property>
2505+ <property name="row_spacing">6</property>
2506+ <child>
2507+ <object class="GtkLabel" id="label22">
2508+ <property name="visible">True</property>
2509+ <property name="xalign">0</property>
2510+ <property name="label" translatable="yes">Username</property>
2511+ </object>
2512+ <packing>
2513+ <property name="x_options">GTK_FILL</property>
2514+ <property name="y_options"></property>
2515+ </packing>
2516+ </child>
2517+ <child>
2518+ <object class="GtkLabel" id="label23">
2519+ <property name="visible">True</property>
2520+ <property name="xalign">0</property>
2521+ <property name="label" translatable="yes">Password</property>
2522+ </object>
2523+ <packing>
2524+ <property name="top_attach">1</property>
2525+ <property name="bottom_attach">2</property>
2526+ <property name="x_options">GTK_FILL</property>
2527+ <property name="y_options"></property>
2528+ </packing>
2529+ </child>
2530+ <child>
2531+ <object class="GtkEntry" id="entryPassword">
2532+ <property name="visible">True</property>
2533+ <property name="can_focus">True</property>
2534+ <property name="visibility">False</property>
2535+ <property name="invisible_char">●</property>
2536+ </object>
2537+ <packing>
2538+ <property name="left_attach">1</property>
2539+ <property name="right_attach">2</property>
2540+ <property name="top_attach">1</property>
2541+ <property name="bottom_attach">2</property>
2542+ <property name="y_options"></property>
2543+ </packing>
2544+ </child>
2545+ <child>
2546+ <object class="GtkEntry" id="entryUsername">
2547+ <property name="visible">True</property>
2548+ <property name="can_focus">True</property>
2549+ <property name="invisible_char">●</property>
2550+ </object>
2551+ <packing>
2552+ <property name="left_attach">1</property>
2553+ <property name="right_attach">2</property>
2554+ <property name="y_options"></property>
2555+ </packing>
2556+ </child>
2557+ </object>
2558+ </child>
2559+ </object>
2560+ </child>
2561+ <child type="label">
2562+ <object class="GtkLabel" id="label24">
2563+ <property name="visible">True</property>
2564+ <property name="ypad">6</property>
2565+ <property name="label" translatable="yes">&lt;b&gt;Freesound account&lt;/b&gt;</property>
2566+ <property name="use_markup">True</property>
2567+ </object>
2568+ </child>
2569+ </object>
2570+ <packing>
2571+ <property name="expand">False</property>
2572+ <property name="fill">False</property>
2573+ <property name="position">0</property>
2574+ </packing>
2575+ </child>
2576+ </object>
2577+ <packing>
2578+ <property name="position">1</property>
2579+ </packing>
2580+ </child>
2581+ <child>
2582+ <object class="GtkLinkButton" id="linkCreateAccount">
2583+ <property name="label" translatable="yes">Create new account</property>
2584+ <property name="visible">True</property>
2585+ <property name="can_focus">True</property>
2586+ <property name="receives_default">True</property>
2587+ <property name="relief">none</property>
2588+ <property name="uri">http://www.freesound.org/forum/profile.php?mode=register</property>
2589+ </object>
2590+ <packing>
2591+ <property name="padding">5</property>
2592+ <property name="position">2</property>
2593+ </packing>
2594+ </child>
2595+ <child>
2596+ <object class="GtkLabel" id="labelWarning">
2597+ <property name="visible">True</property>
2598+ <property name="use_markup">True</property>
2599+ </object>
2600+ <packing>
2601+ <property name="expand">False</property>
2602+ <property name="fill">False</property>
2603+ <property name="position">3</property>
2604+ </packing>
2605+ </child>
2606+ <child internal-child="action_area">
2607+ <object class="GtkHButtonBox" id="dialog-action_area1">
2608+ <property name="visible">True</property>
2609+ <property name="layout_style">end</property>
2610+ <child>
2611+ <object class="GtkButton" id="buttonCancel">
2612+ <property name="label">gtk-cancel</property>
2613+ <property name="visible">True</property>
2614+ <property name="can_focus">True</property>
2615+ <property name="can_default">True</property>
2616+ <property name="receives_default">False</property>
2617+ <property name="use_stock">True</property>
2618+ <signal name="clicked" handler="on_buttonCancel_clicked"/>
2619+ </object>
2620+ <packing>
2621+ <property name="expand">False</property>
2622+ <property name="fill">False</property>
2623+ <property name="position">0</property>
2624+ </packing>
2625+ </child>
2626+ <child>
2627+ <object class="GtkButton" id="buttonOK">
2628+ <property name="label">gtk-ok</property>
2629+ <property name="visible">True</property>
2630+ <property name="can_focus">True</property>
2631+ <property name="can_default">True</property>
2632+ <property name="receives_default">False</property>
2633+ <property name="use_stock">True</property>
2634+ <signal name="clicked" handler="on_buttonOK_clicked"/>
2635+ </object>
2636+ <packing>
2637+ <property name="expand">False</property>
2638+ <property name="fill">False</property>
2639+ <property name="position">1</property>
2640+ </packing>
2641+ </child>
2642+ </object>
2643+ <packing>
2644+ <property name="expand">False</property>
2645+ <property name="pack_type">end</property>
2646+ <property name="position">0</property>
2647+ </packing>
2648+ </child>
2649+ </object>
2650+ </child>
2651+ <action-widgets>
2652+ <action-widget response="-6">buttonCancel</action-widget>
2653+ <action-widget response="-5">buttonOK</action-widget>
2654+ </action-widgets>
2655+ </object>
2656+</interface>
2657
2658=== modified file 'extensions/eggs/InstrumentTypeManager/setup.py'
2659--- extensions/eggs/InstrumentTypeManager/setup.py 2007-02-03 20:53:32 +0000
2660+++ extensions/eggs/InstrumentTypeManager/setup.py 2011-02-28 22:41:14 +0000
2661@@ -1,13 +1,13 @@
2662 from setuptools import setup
2663 import sys, os
2664 from shutil import copy
2665-version="0.2"
2666+version="0.11"
2667 setup(name="InstrumentTypeManager",
2668 version=version,
2669 description="Adds or Removes an instrument type from jokosher",
2670 packages=["InstrumentTypeManager"],
2671 package_dir={"InstrumentTypeManager":"src"},
2672-package_data={"":["InstrumentTypeManager.glade"]},
2673+package_data={"":["InstrumentTypeManager.ui"]},
2674 entry_points="""
2675 [jokosher.extensions]
2676 extension = InstrumentTypeManager:InstrumentTypeManager
2677
2678=== removed file 'extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.glade'
2679--- extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.glade 2007-02-03 21:02:01 +0000
2680+++ extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.glade 1970-01-01 00:00:00 +0000
2681@@ -1,278 +0,0 @@
2682-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
2683-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
2684-
2685-<glade-interface>
2686-
2687-<widget class="GtkDialog" id="NewInstrumentTypeDialog">
2688- <property name="visible">True</property>
2689- <property name="title" translatable="yes">Add New Instrument Type</property>
2690- <property name="type">GTK_WINDOW_TOPLEVEL</property>
2691- <property name="window_position">GTK_WIN_POS_NONE</property>
2692- <property name="modal">False</property>
2693- <property name="default_width">350</property>
2694- <property name="default_height">150</property>
2695- <property name="resizable">True</property>
2696- <property name="destroy_with_parent">False</property>
2697- <property name="decorated">True</property>
2698- <property name="skip_taskbar_hint">False</property>
2699- <property name="skip_pager_hint">False</property>
2700- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
2701- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
2702- <property name="focus_on_map">True</property>
2703- <property name="urgency_hint">False</property>
2704- <property name="has_separator">True</property>
2705-
2706- <child internal-child="vbox">
2707- <widget class="GtkVBox" id="vbox1">
2708- <property name="visible">True</property>
2709- <property name="homogeneous">False</property>
2710- <property name="spacing">0</property>
2711-
2712- <child internal-child="action_area">
2713- <widget class="GtkHButtonBox" id="dialog-action_area1">
2714- <property name="visible">True</property>
2715- <property name="layout_style">GTK_BUTTONBOX_END</property>
2716-
2717- <child>
2718- <widget class="GtkButton" id="applybutton1">
2719- <property name="visible">True</property>
2720- <property name="can_default">True</property>
2721- <property name="can_focus">True</property>
2722- <property name="label">gtk-apply</property>
2723- <property name="use_stock">True</property>
2724- <property name="relief">GTK_RELIEF_NORMAL</property>
2725- <property name="focus_on_click">True</property>
2726- <property name="response_id">-10</property>
2727- <signal name="clicked" handler="on_Apply_clicked" last_modification_time="Fri, 26 Jan 2007 03:32:14 GMT"/>
2728- </widget>
2729- </child>
2730-
2731- <child>
2732- <widget class="GtkButton" id="okbutton1">
2733- <property name="visible">True</property>
2734- <property name="can_default">True</property>
2735- <property name="can_focus">True</property>
2736- <property name="label">gtk-ok</property>
2737- <property name="use_stock">True</property>
2738- <property name="relief">GTK_RELIEF_NORMAL</property>
2739- <property name="focus_on_click">True</property>
2740- <property name="response_id">-5</property>
2741- <signal name="clicked" handler="on_OK_clicked" last_modification_time="Fri, 26 Jan 2007 02:52:51 GMT"/>
2742- </widget>
2743- </child>
2744- </widget>
2745- <packing>
2746- <property name="padding">0</property>
2747- <property name="expand">False</property>
2748- <property name="fill">True</property>
2749- <property name="pack_type">GTK_PACK_END</property>
2750- </packing>
2751- </child>
2752-
2753- <child>
2754- <widget class="GtkTable" id="table1">
2755- <property name="visible">True</property>
2756- <property name="n_rows">2</property>
2757- <property name="n_columns">2</property>
2758- <property name="homogeneous">False</property>
2759- <property name="row_spacing">6</property>
2760- <property name="column_spacing">12</property>
2761-
2762- <child>
2763- <widget class="GtkLabel" id="label2">
2764- <property name="visible">True</property>
2765- <property name="label" translatable="yes">Instrument Name:</property>
2766- <property name="use_underline">False</property>
2767- <property name="use_markup">False</property>
2768- <property name="justify">GTK_JUSTIFY_LEFT</property>
2769- <property name="wrap">False</property>
2770- <property name="selectable">False</property>
2771- <property name="xalign">0</property>
2772- <property name="yalign">0.5</property>
2773- <property name="xpad">0</property>
2774- <property name="ypad">0</property>
2775- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2776- <property name="width_chars">-1</property>
2777- <property name="single_line_mode">False</property>
2778- <property name="angle">0</property>
2779- </widget>
2780- <packing>
2781- <property name="left_attach">0</property>
2782- <property name="right_attach">1</property>
2783- <property name="top_attach">0</property>
2784- <property name="bottom_attach">1</property>
2785- <property name="x_options">fill</property>
2786- <property name="y_options"></property>
2787- </packing>
2788- </child>
2789-
2790- <child>
2791- <widget class="GtkLabel" id="label3">
2792- <property name="visible">True</property>
2793- <property name="label" translatable="yes">Icon:</property>
2794- <property name="use_underline">False</property>
2795- <property name="use_markup">False</property>
2796- <property name="justify">GTK_JUSTIFY_LEFT</property>
2797- <property name="wrap">False</property>
2798- <property name="selectable">False</property>
2799- <property name="xalign">0</property>
2800- <property name="yalign">0.5</property>
2801- <property name="xpad">0</property>
2802- <property name="ypad">0</property>
2803- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
2804- <property name="width_chars">-1</property>
2805- <property name="single_line_mode">False</property>
2806- <property name="angle">0</property>
2807- </widget>
2808- <packing>
2809- <property name="left_attach">0</property>
2810- <property name="right_attach">1</property>
2811- <property name="top_attach">1</property>
2812- <property name="bottom_attach">2</property>
2813- <property name="x_options">fill</property>
2814- <property name="y_options"></property>
2815- </packing>
2816- </child>
2817-
2818- <child>
2819- <widget class="GtkHBox" id="hbox1">
2820- <property name="visible">True</property>
2821- <property name="homogeneous">False</property>
2822- <property name="spacing">0</property>
2823-
2824- <child>
2825- <widget class="GtkComboBoxEntry" id="comboboxentry1">
2826- <property name="visible">True</property>
2827- <property name="add_tearoffs">False</property>
2828- <property name="has_frame">True</property>
2829- <property name="focus_on_click">True</property>
2830- <signal name="changed" handler="on_Instrument_changed" last_modification_time="Fri, 26 Jan 2007 17:38:43 GMT"/>
2831- </widget>
2832- <packing>
2833- <property name="padding">0</property>
2834- <property name="expand">True</property>
2835- <property name="fill">True</property>
2836- </packing>
2837- </child>
2838-
2839- <child>
2840- <widget class="GtkButton" id="button1">
2841- <property name="width_request">28</property>
2842- <property name="height_request">28</property>
2843- <property name="visible">True</property>
2844- <property name="can_focus">True</property>
2845- <property name="relief">GTK_RELIEF_NORMAL</property>
2846- <property name="focus_on_click">True</property>
2847- <signal name="clicked" handler="on_Add_clicked" last_modification_time="Fri, 26 Jan 2007 02:06:28 GMT"/>
2848-
2849- <child>
2850- <widget class="GtkImage" id="image1">
2851- <property name="visible">True</property>
2852- <property name="stock">gtk-add</property>
2853- <property name="icon_size">4</property>
2854- <property name="xalign">0.5</property>
2855- <property name="yalign">0.5</property>
2856- <property name="xpad">0</property>
2857- <property name="ypad">0</property>
2858- </widget>
2859- </child>
2860- </widget>
2861- <packing>
2862- <property name="padding">0</property>
2863- <property name="expand">False</property>
2864- <property name="fill">False</property>
2865- </packing>
2866- </child>
2867-
2868- <child>
2869- <widget class="GtkButton" id="button2">
2870- <property name="width_request">28</property>
2871- <property name="height_request">28</property>
2872- <property name="visible">True</property>
2873- <property name="can_focus">True</property>
2874- <property name="relief">GTK_RELIEF_NORMAL</property>
2875- <property name="focus_on_click">True</property>
2876- <signal name="clicked" handler="on_Remove_clicked" last_modification_time="Fri, 26 Jan 2007 02:04:35 GMT"/>
2877-
2878- <child>
2879- <widget class="GtkImage" id="image2">
2880- <property name="visible">True</property>
2881- <property name="stock">gtk-remove</property>
2882- <property name="icon_size">4</property>
2883- <property name="xalign">0.5</property>
2884- <property name="yalign">0.5</property>
2885- <property name="xpad">0</property>
2886- <property name="ypad">0</property>
2887- </widget>
2888- </child>
2889- </widget>
2890- <packing>
2891- <property name="padding">0</property>
2892- <property name="expand">False</property>
2893- <property name="fill">False</property>
2894- </packing>
2895- </child>
2896- </widget>
2897- <packing>
2898- <property name="left_attach">1</property>
2899- <property name="right_attach">2</property>
2900- <property name="top_attach">0</property>
2901- <property name="bottom_attach">1</property>
2902- <property name="x_options">fill</property>
2903- <property name="y_options">fill</property>
2904- </packing>
2905- </child>
2906-
2907- <child>
2908- <widget class="GtkHBox" id="hbox2">
2909- <property name="visible">True</property>
2910- <property name="homogeneous">False</property>
2911- <property name="spacing">0</property>
2912-
2913- <child>
2914- <widget class="GtkButton" id="button3">
2915- <property name="width_request">60</property>
2916- <property name="height_request">60</property>
2917- <property name="visible">True</property>
2918- <property name="sensitive">False</property>
2919- <property name="can_focus">True</property>
2920- <property name="relief">GTK_RELIEF_NORMAL</property>
2921- <property name="focus_on_click">True</property>
2922- <signal name="clicked" handler="on_Icon_clicked" last_modification_time="Fri, 26 Jan 2007 17:32:02 GMT"/>
2923-
2924- <child>
2925- <placeholder/>
2926- </child>
2927- </widget>
2928- <packing>
2929- <property name="padding">0</property>
2930- <property name="expand">False</property>
2931- <property name="fill">False</property>
2932- </packing>
2933- </child>
2934-
2935- <child>
2936- <placeholder/>
2937- </child>
2938- </widget>
2939- <packing>
2940- <property name="left_attach">1</property>
2941- <property name="right_attach">2</property>
2942- <property name="top_attach">1</property>
2943- <property name="bottom_attach">2</property>
2944- <property name="x_options">fill</property>
2945- <property name="y_options">fill</property>
2946- </packing>
2947- </child>
2948- </widget>
2949- <packing>
2950- <property name="padding">0</property>
2951- <property name="expand">True</property>
2952- <property name="fill">True</property>
2953- </packing>
2954- </child>
2955- </widget>
2956- </child>
2957-</widget>
2958-
2959-</glade-interface>
2960
2961=== modified file 'extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.py'
2962--- extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.py 2010-07-16 15:12:23 +0000
2963+++ extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.py 2011-02-28 22:41:14 +0000
2964@@ -8,14 +8,13 @@
2965
2966 import Jokosher.Extension
2967 import gtk
2968-import gtk.glade
2969 import os
2970 import pkg_resources
2971
2972 class InstrumentTypeManager:
2973 EXTENSION_NAME = "Instrument Type Manager"
2974 EXTENSION_DESCRIPTION = "Adds or deletes an instrument type from jokosher"
2975- EXTENSION_VERSION = "0.2"
2976+ EXTENSION_VERSION = "0.11"
2977
2978 def OnOk(self, arg):
2979 self.OnApply()
2980@@ -104,8 +103,9 @@
2981 confirm_dlg.destroy()
2982
2983 def OnMenuItemClick(self, arg):
2984- xmlString = pkg_resources.resource_string(__name__,"InstrumentTypeManager.glade")
2985- self.wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString),"NewInstrumentTypeDialog")
2986+ xmlString = pkg_resources.resource_string(__name__,"InstrumentTypeManager.ui")
2987+ self.gtkBuilder = gtk.Builder()
2988+ self.gtkBuilder.add_from_string(xmlString)
2989
2990 signals = {
2991 "on_OK_clicked" : self.OnOk,
2992@@ -115,13 +115,13 @@
2993 "on_Instrument_changed": self.OnInstrumentChanged,
2994 "on_Icon_clicked": self.OnIconClicked,
2995 }
2996- self.wTree.signal_autoconnect(signals)
2997+ self.gtkBuilder.connect_signals(signals)
2998
2999- self.window = self.wTree.get_widget("NewInstrumentTypeDialog")
3000+ self.window = self.gtkBuilder.get_object("NewInstrumentTypeDialog")
3001 self.API.set_window_icon(self.window)
3002- self.icon = self.wTree.get_widget("button3")
3003- self.instrument_name = self.wTree.get_widget("comboboxentry1")
3004- self.icon_button = self.wTree.get_widget("button3")
3005+ self.icon = self.gtkBuilder.get_object("button3")
3006+ self.instrument_name = self.gtkBuilder.get_object("comboboxentry1")
3007+ self.icon_button = self.gtkBuilder.get_object("button3")
3008
3009 self.instrument_name.child.set_property("editable", False)
3010
3011@@ -129,11 +129,11 @@
3012 gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK))
3013 self.filechooser.set_default_response(gtk.RESPONSE_OK)
3014
3015- filter = gtk.FileFilter()
3016- filter.add_pixbuf_formats()
3017- filter.set_name("Images")
3018+ fileFilter = gtk.FileFilter()
3019+ fileFilter.add_pixbuf_formats()
3020+ fileFilter.set_name("Images")
3021
3022- self.filechooser.add_filter(filter)
3023+ self.filechooser.add_filter(fileFilter)
3024
3025 self.changes_flag = None
3026
3027
3028=== added file 'extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.ui'
3029--- extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.ui 1970-01-01 00:00:00 +0000
3030+++ extensions/eggs/InstrumentTypeManager/src/InstrumentTypeManager.ui 2011-02-28 22:41:14 +0000
3031@@ -0,0 +1,198 @@
3032+<?xml version="1.0" encoding="UTF-8"?>
3033+<interface>
3034+ <!-- interface-requires gtk+ 2.6 -->
3035+ <!-- interface-naming-policy toplevel-contextual -->
3036+ <object class="GtkDialog" id="NewInstrumentTypeDialog">
3037+ <property name="visible">True</property>
3038+ <property name="title" translatable="yes">Add New Instrument Type</property>
3039+ <property name="default_width">350</property>
3040+ <property name="default_height">150</property>
3041+ <property name="type_hint">dialog</property>
3042+ <property name="has_separator">True</property>
3043+ <child internal-child="vbox">
3044+ <object class="GtkVBox" id="vbox1">
3045+ <property name="visible">True</property>
3046+ <child>
3047+ <object class="GtkTable" id="table1">
3048+ <property name="visible">True</property>
3049+ <property name="n_rows">2</property>
3050+ <property name="n_columns">2</property>
3051+ <property name="column_spacing">12</property>
3052+ <property name="row_spacing">6</property>
3053+ <child>
3054+ <object class="GtkLabel" id="label2">
3055+ <property name="visible">True</property>
3056+ <property name="xalign">0</property>
3057+ <property name="label" translatable="yes">Instrument Name:</property>
3058+ </object>
3059+ <packing>
3060+ <property name="x_options">GTK_FILL</property>
3061+ <property name="y_options"></property>
3062+ </packing>
3063+ </child>
3064+ <child>
3065+ <object class="GtkLabel" id="label3">
3066+ <property name="visible">True</property>
3067+ <property name="xalign">0</property>
3068+ <property name="label" translatable="yes">Icon:</property>
3069+ </object>
3070+ <packing>
3071+ <property name="top_attach">1</property>
3072+ <property name="bottom_attach">2</property>
3073+ <property name="x_options">GTK_FILL</property>
3074+ <property name="y_options"></property>
3075+ </packing>
3076+ </child>
3077+ <child>
3078+ <object class="GtkHBox" id="hbox1">
3079+ <property name="visible">True</property>
3080+ <child>
3081+ <object class="GtkComboBoxEntry" id="comboboxentry1">
3082+ <property name="visible">True</property>
3083+ <signal name="changed" handler="on_Instrument_changed"/>
3084+ </object>
3085+ <packing>
3086+ <property name="position">0</property>
3087+ </packing>
3088+ </child>
3089+ <child>
3090+ <object class="GtkButton" id="button1">
3091+ <property name="width_request">28</property>
3092+ <property name="height_request">28</property>
3093+ <property name="visible">True</property>
3094+ <property name="can_focus">True</property>
3095+ <property name="receives_default">False</property>
3096+ <signal name="clicked" handler="on_Add_clicked"/>
3097+ <child>
3098+ <object class="GtkImage" id="image1">
3099+ <property name="visible">True</property>
3100+ <property name="stock">gtk-add</property>
3101+ </object>
3102+ </child>
3103+ </object>
3104+ <packing>
3105+ <property name="expand">False</property>
3106+ <property name="fill">False</property>
3107+ <property name="position">1</property>
3108+ </packing>
3109+ </child>
3110+ <child>
3111+ <object class="GtkButton" id="button2">
3112+ <property name="width_request">28</property>
3113+ <property name="height_request">28</property>
3114+ <property name="visible">True</property>
3115+ <property name="can_focus">True</property>
3116+ <property name="receives_default">False</property>
3117+ <signal name="clicked" handler="on_Remove_clicked"/>
3118+ <child>
3119+ <object class="GtkImage" id="image2">
3120+ <property name="visible">True</property>
3121+ <property name="stock">gtk-remove</property>
3122+ </object>
3123+ </child>
3124+ </object>
3125+ <packing>
3126+ <property name="expand">False</property>
3127+ <property name="fill">False</property>
3128+ <property name="position">2</property>
3129+ </packing>
3130+ </child>
3131+ </object>
3132+ <packing>
3133+ <property name="left_attach">1</property>
3134+ <property name="right_attach">2</property>
3135+ <property name="x_options">GTK_FILL</property>
3136+ <property name="y_options">GTK_FILL</property>
3137+ </packing>
3138+ </child>
3139+ <child>
3140+ <object class="GtkHBox" id="hbox2">
3141+ <property name="visible">True</property>
3142+ <child>
3143+ <object class="GtkButton" id="button3">
3144+ <property name="width_request">60</property>
3145+ <property name="height_request">60</property>
3146+ <property name="visible">True</property>
3147+ <property name="sensitive">False</property>
3148+ <property name="can_focus">True</property>
3149+ <property name="receives_default">False</property>
3150+ <signal name="clicked" handler="on_Icon_clicked"/>
3151+ <child>
3152+ <placeholder/>
3153+ </child>
3154+ </object>
3155+ <packing>
3156+ <property name="expand">False</property>
3157+ <property name="fill">False</property>
3158+ <property name="position">0</property>
3159+ </packing>
3160+ </child>
3161+ <child>
3162+ <placeholder/>
3163+ </child>
3164+ </object>
3165+ <packing>
3166+ <property name="left_attach">1</property>
3167+ <property name="right_attach">2</property>
3168+ <property name="top_attach">1</property>
3169+ <property name="bottom_attach">2</property>
3170+ <property name="x_options">GTK_FILL</property>
3171+ <property name="y_options">GTK_FILL</property>
3172+ </packing>
3173+ </child>
3174+ </object>
3175+ <packing>
3176+ <property name="position">2</property>
3177+ </packing>
3178+ </child>
3179+ <child internal-child="action_area">
3180+ <object class="GtkHButtonBox" id="dialog-action_area1">
3181+ <property name="visible">True</property>
3182+ <property name="layout_style">end</property>
3183+ <child>
3184+ <object class="GtkButton" id="applybutton1">
3185+ <property name="label">gtk-apply</property>
3186+ <property name="visible">True</property>
3187+ <property name="can_focus">True</property>
3188+ <property name="can_default">True</property>
3189+ <property name="receives_default">False</property>
3190+ <property name="use_stock">True</property>
3191+ <signal name="clicked" handler="on_Apply_clicked"/>
3192+ </object>
3193+ <packing>
3194+ <property name="expand">False</property>
3195+ <property name="fill">False</property>
3196+ <property name="position">0</property>
3197+ </packing>
3198+ </child>
3199+ <child>
3200+ <object class="GtkButton" id="okbutton1">
3201+ <property name="label">gtk-ok</property>
3202+ <property name="visible">True</property>
3203+ <property name="can_focus">True</property>
3204+ <property name="can_default">True</property>
3205+ <property name="receives_default">False</property>
3206+ <property name="use_stock">True</property>
3207+ <signal name="clicked" handler="on_OK_clicked"/>
3208+ </object>
3209+ <packing>
3210+ <property name="expand">False</property>
3211+ <property name="fill">False</property>
3212+ <property name="position">1</property>
3213+ </packing>
3214+ </child>
3215+ </object>
3216+ <packing>
3217+ <property name="expand">False</property>
3218+ <property name="pack_type">end</property>
3219+ <property name="position">0</property>
3220+ </packing>
3221+ </child>
3222+ </object>
3223+ </child>
3224+ <action-widgets>
3225+ <action-widget response="-10">applybutton1</action-widget>
3226+ <action-widget response="-5">okbutton1</action-widget>
3227+ </action-widgets>
3228+ </object>
3229+</interface>
3230
3231=== modified file 'extensions/eggs/Minimal/setup.py'
3232--- extensions/eggs/Minimal/setup.py 2007-02-02 01:17:27 +0000
3233+++ extensions/eggs/Minimal/setup.py 2011-02-28 22:41:14 +0000
3234@@ -1,13 +1,13 @@
3235 from setuptools import setup
3236 import sys, os
3237 from shutil import copy
3238-version="0.9"
3239+version="0.11"
3240 setup(name="Minimal",
3241 version=version,
3242 description="Runs a mimimal version of Jokosher",
3243 packages=["Minimal"],
3244 package_dir={"Minimal":"src"},
3245-package_data={"":["Minimal.glade"]},
3246+package_data={"":["Minimal.ui"]},
3247 entry_points="""
3248 [jokosher.extensions]
3249 extension = Minimal:Minimal
3250
3251=== removed file 'extensions/eggs/Minimal/src/Minimal.glade'
3252--- extensions/eggs/Minimal/src/Minimal.glade 2007-02-11 04:23:38 +0000
3253+++ extensions/eggs/Minimal/src/Minimal.glade 1970-01-01 00:00:00 +0000
3254@@ -1,186 +0,0 @@
3255-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
3256-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
3257-
3258-<glade-interface>
3259-
3260-<widget class="GtkWindow" id="MinimalDialog">
3261- <property name="visible">True</property>
3262- <property name="title" translatable="yes">Minimal Jokosher</property>
3263- <property name="type">GTK_WINDOW_TOPLEVEL</property>
3264- <property name="window_position">GTK_WIN_POS_CENTER</property>
3265- <property name="modal">False</property>
3266- <property name="resizable">True</property>
3267- <property name="destroy_with_parent">False</property>
3268- <property name="decorated">True</property>
3269- <property name="skip_taskbar_hint">False</property>
3270- <property name="skip_pager_hint">False</property>
3271- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
3272- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
3273- <property name="focus_on_map">True</property>
3274- <property name="urgency_hint">False</property>
3275- <signal name="delete_event" handler="on_MinimalDialog_delete_event" last_modification_time="Thu, 18 Jan 2007 14:06:06 GMT"/>
3276-
3277- <child>
3278- <widget class="GtkHBox" id="hbox1">
3279- <property name="border_width">6</property>
3280- <property name="visible">True</property>
3281- <property name="homogeneous">False</property>
3282- <property name="spacing">0</property>
3283-
3284- <child>
3285- <widget class="GtkHBox" id="hbox2">
3286- <property name="visible">True</property>
3287- <property name="homogeneous">True</property>
3288- <property name="spacing">6</property>
3289-
3290- <child>
3291- <widget class="GtkButton" id="stopButton">
3292- <property name="visible">True</property>
3293- <property name="tooltip" translatable="yes">Stop playback</property>
3294- <property name="can_focus">True</property>
3295- <property name="label">gtk-media-stop</property>
3296- <property name="use_stock">True</property>
3297- <property name="relief">GTK_RELIEF_NORMAL</property>
3298- <property name="focus_on_click">True</property>
3299- <signal name="clicked" handler="on_stopButton_clicked" last_modification_time="Mon, 22 Jan 2007 10:03:29 GMT"/>
3300- </widget>
3301- <packing>
3302- <property name="padding">0</property>
3303- <property name="expand">False</property>
3304- <property name="fill">True</property>
3305- </packing>
3306- </child>
3307-
3308- <child>
3309- <widget class="GtkToggleButton" id="playButton">
3310- <property name="visible">True</property>
3311- <property name="tooltip" translatable="yes">Start playback</property>
3312- <property name="can_focus">True</property>
3313- <property name="label">gtk-media-play</property>
3314- <property name="use_stock">True</property>
3315- <property name="relief">GTK_RELIEF_NORMAL</property>
3316- <property name="focus_on_click">True</property>
3317- <property name="active">False</property>
3318- <property name="inconsistent">False</property>
3319- <signal name="clicked" handler="on_playButton_clicked" last_modification_time="Mon, 22 Jan 2007 10:03:40 GMT"/>
3320- </widget>
3321- <packing>
3322- <property name="padding">0</property>
3323- <property name="expand">False</property>
3324- <property name="fill">True</property>
3325- </packing>
3326- </child>
3327-
3328- <child>
3329- <widget class="GtkToggleButton" id="recordButton">
3330- <property name="visible">True</property>
3331- <property name="tooltip" translatable="yes">Start recording</property>
3332- <property name="can_focus">True</property>
3333- <property name="label">gtk-media-record</property>
3334- <property name="use_stock">True</property>
3335- <property name="relief">GTK_RELIEF_NORMAL</property>
3336- <property name="focus_on_click">True</property>
3337- <property name="active">False</property>
3338- <property name="inconsistent">False</property>
3339- <signal name="clicked" handler="on_recordButton_clicked" last_modification_time="Mon, 22 Jan 2007 10:03:47 GMT"/>
3340- </widget>
3341- <packing>
3342- <property name="padding">0</property>
3343- <property name="expand">False</property>
3344- <property name="fill">True</property>
3345- </packing>
3346- </child>
3347-
3348- <child>
3349- <widget class="GtkToggleButton" id="abButton">
3350- <property name="visible">True</property>
3351- <property name="sensitive">False</property>
3352- <property name="tooltip" translatable="yes">Set the start position for loop playback</property>
3353- <property name="can_focus">True</property>
3354- <property name="label" translatable="yes">A-B</property>
3355- <property name="use_underline">True</property>
3356- <property name="relief">GTK_RELIEF_NORMAL</property>
3357- <property name="focus_on_click">True</property>
3358- <property name="active">False</property>
3359- <property name="inconsistent">False</property>
3360- <signal name="clicked" handler="on_abButton_clicked" last_modification_time="Mon, 22 Jan 2007 10:03:55 GMT"/>
3361- </widget>
3362- <packing>
3363- <property name="padding">0</property>
3364- <property name="expand">False</property>
3365- <property name="fill">True</property>
3366- </packing>
3367- </child>
3368-
3369- <child>
3370- <widget class="GtkButton" id="hideShowButton">
3371- <property name="visible">True</property>
3372- <property name="tooltip" translatable="yes">Show the main Jokosher window</property>
3373- <property name="can_focus">True</property>
3374- <property name="label" translatable="yes">S_how</property>
3375- <property name="use_underline">True</property>
3376- <property name="relief">GTK_RELIEF_NORMAL</property>
3377- <property name="focus_on_click">True</property>
3378- <signal name="clicked" handler="on_hideShowButton_clicked" last_modification_time="Mon, 22 Jan 2007 10:04:05 GMT"/>
3379- </widget>
3380- <packing>
3381- <property name="padding">0</property>
3382- <property name="expand">False</property>
3383- <property name="fill">True</property>
3384- </packing>
3385- </child>
3386-
3387- <child>
3388- <widget class="GtkButton" id="closeButton">
3389- <property name="visible">True</property>
3390- <property name="tooltip" translatable="yes">Close this dialog</property>
3391- <property name="can_focus">True</property>
3392- <property name="label">gtk-close</property>
3393- <property name="use_stock">True</property>
3394- <property name="relief">GTK_RELIEF_NORMAL</property>
3395- <property name="focus_on_click">True</property>
3396- <signal name="clicked" handler="on_closeButton_clicked" last_modification_time="Fri, 02 Feb 2007 20:39:31 GMT"/>
3397- </widget>
3398- <packing>
3399- <property name="padding">0</property>
3400- <property name="expand">False</property>
3401- <property name="fill">True</property>
3402- </packing>
3403- </child>
3404- </widget>
3405- <packing>
3406- <property name="padding">0</property>
3407- <property name="expand">True</property>
3408- <property name="fill">True</property>
3409- </packing>
3410- </child>
3411-
3412- <child>
3413- <widget class="GtkLabel" id="timeLabel">
3414- <property name="visible">True</property>
3415- <property name="label" translatable="yes">0:00:000</property>
3416- <property name="use_underline">False</property>
3417- <property name="use_markup">True</property>
3418- <property name="justify">GTK_JUSTIFY_LEFT</property>
3419- <property name="wrap">False</property>
3420- <property name="selectable">False</property>
3421- <property name="xalign">0</property>
3422- <property name="yalign">0.5</property>
3423- <property name="xpad">5</property>
3424- <property name="ypad">0</property>
3425- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
3426- <property name="width_chars">-1</property>
3427- <property name="single_line_mode">False</property>
3428- <property name="angle">0</property>
3429- </widget>
3430- <packing>
3431- <property name="padding">0</property>
3432- <property name="expand">False</property>
3433- <property name="fill">False</property>
3434- </packing>
3435- </child>
3436- </widget>
3437- </child>
3438-</widget>
3439-
3440-</glade-interface>
3441
3442=== removed file 'extensions/eggs/Minimal/src/Minimal.gladep'
3443--- extensions/eggs/Minimal/src/Minimal.gladep 2007-02-02 22:40:16 +0000
3444+++ extensions/eggs/Minimal/src/Minimal.gladep 1970-01-01 00:00:00 +0000
3445@@ -1,8 +0,0 @@
3446-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
3447-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
3448-
3449-<glade-project>
3450- <name></name>
3451- <program_name></program_name>
3452- <gnome_support>FALSE</gnome_support>
3453-</glade-project>
3454
3455=== modified file 'extensions/eggs/Minimal/src/Minimal.py'
3456--- extensions/eggs/Minimal/src/Minimal.py 2010-07-16 15:12:23 +0000
3457+++ extensions/eggs/Minimal/src/Minimal.py 2011-02-28 22:41:14 +0000
3458@@ -8,7 +8,6 @@
3459
3460 import Jokosher.Extension
3461 import gtk
3462-import gtk.glade
3463 import pkg_resources
3464 import time
3465 import gobject
3466@@ -29,7 +28,7 @@
3467 """
3468 EXTENSION_NAME = "Minimal"
3469 EXTENSION_DESCRIPTION = "Replaces the normal Jokosher window with a tiny dialog"
3470- EXTENSION_VERSION = "0.9"
3471+ EXTENSION_VERSION = "0.11"
3472
3473 #_____________________________________________________________________
3474
3475@@ -63,17 +62,18 @@
3476 Parameters:
3477 arg -- set by GTK
3478 """
3479- xmlString = pkg_resources.resource_string(__name__,"Minimal.glade")
3480- wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString))
3481+ xmlString = pkg_resources.resource_string(__name__,"Minimal.ui")
3482+ gtkBuilder = gtk.Builder()
3483+ gtkBuilder.add_from_string(xmlString)
3484
3485- self.window = wTree.get_widget("MinimalDialog")
3486+ self.window = gtkBuilder.get_object("MinimalDialog")
3487 self.API.set_window_icon(self.window)
3488- self.timeLabel = wTree.get_widget("timeLabel")
3489- self.hideShowButton = wTree.get_widget("hideShowButton")
3490- self.abButton = wTree.get_widget("abButton")
3491- self.play = wTree.get_widget("playButton")
3492- self.stop = wTree.get_widget("stopButton")
3493- self.record = wTree.get_widget("recordButton")
3494+ self.timeLabel = gtkBuilder.get_object("timeLabel")
3495+ self.hideShowButton = gtkBuilder.get_object("hideShowButton")
3496+ self.abButton = gtkBuilder.get_object("abButton")
3497+ self.play = gtkBuilder.get_object("playButton")
3498+ self.stop = gtkBuilder.get_object("stopButton")
3499+ self.record = gtkBuilder.get_object("recordButton")
3500
3501 signals = {
3502 "on_stopButton_clicked" : self.OnStop,
3503@@ -86,7 +86,7 @@
3504 }
3505
3506 self.abStatus = self.abStart = self.abEnd = 0
3507- wTree.signal_autoconnect(signals)
3508+ gtkBuilder.connect_signals(signals)
3509 self.API.hide_main_window()
3510 self.mainWindowHide = True
3511 self.currentPosition = (-1, -1, -1, -1)
3512@@ -224,18 +224,17 @@
3513 """
3514 GTK callback when the "A-B" button is clicked.
3515 """
3516- tooltip = gtk.tooltips_data_get(self.abButton)[0]
3517 if self.abStatus == 0:
3518 self.abStatus = 1
3519 self.abButton.set_label("A-")
3520 self.abButton.set_active(True)
3521- tooltip.set_tip(self.abButton, _("Select the end position for looped playback"))
3522+ self.abButton.set_tooltip_text(_("Select the end position for looped playback"))
3523 self.abStart = self.API.get_position()
3524 elif self.abStatus ==1:
3525 self.abStatus = 2
3526 self.abButton.set_label("A-B")
3527 self.abButton.set_active(True)
3528- tooltip.set_tip(self.abButton, _("End looped playback"))
3529+ self.abButton.set_tooltip_text(_("End looped playback"))
3530 self.abEnd = self.API.get_position()
3531 self.API.seek(self.abStart, self.abEnd)
3532 else:
3533@@ -273,8 +272,7 @@
3534 self.abStatus = self.abStart = self.abEnd = 0
3535 self.abButton.set_label("A-B")
3536 self.abButton.set_active(False)
3537- tooltip = gtk.tooltips_data_get(self.abButton)[0]
3538- tooltip.set_tip(self.abButton, _("Select the start position for looped playback"))
3539+ self.abButton.set_tooltip_text(_("Select the start position for looped playback"))
3540
3541 #____________________________________________________________________
3542
3543
3544=== added file 'extensions/eggs/Minimal/src/Minimal.ui'
3545--- extensions/eggs/Minimal/src/Minimal.ui 1970-01-01 00:00:00 +0000
3546+++ extensions/eggs/Minimal/src/Minimal.ui 2011-02-28 22:41:14 +0000
3547@@ -0,0 +1,131 @@
3548+<?xml version="1.0" encoding="UTF-8"?>
3549+<interface>
3550+ <requires lib="gtk+" version="2.16"/>
3551+ <!-- interface-naming-policy toplevel-contextual -->
3552+ <object class="GtkWindow" id="MinimalDialog">
3553+ <property name="visible">True</property>
3554+ <property name="title" translatable="yes">Minimal Jokosher</property>
3555+ <property name="window_position">center</property>
3556+ <signal name="delete_event" handler="on_MinimalDialog_delete_event"/>
3557+ <child>
3558+ <object class="GtkHBox" id="hbox1">
3559+ <property name="visible">True</property>
3560+ <property name="border_width">6</property>
3561+ <child>
3562+ <object class="GtkHBox" id="hbox2">
3563+ <property name="visible">True</property>
3564+ <property name="spacing">6</property>
3565+ <property name="homogeneous">True</property>
3566+ <child>
3567+ <object class="GtkButton" id="stopButton">
3568+ <property name="label">gtk-media-stop</property>
3569+ <property name="visible">True</property>
3570+ <property name="can_focus">True</property>
3571+ <property name="receives_default">False</property>
3572+ <property name="tooltip_text" translatable="yes">Stop playback</property>
3573+ <property name="use_stock">True</property>
3574+ <signal name="clicked" handler="on_stopButton_clicked"/>
3575+ </object>
3576+ <packing>
3577+ <property name="expand">False</property>
3578+ <property name="position">0</property>
3579+ </packing>
3580+ </child>
3581+ <child>
3582+ <object class="GtkToggleButton" id="playButton">
3583+ <property name="label">gtk-media-play</property>
3584+ <property name="visible">True</property>
3585+ <property name="can_focus">True</property>
3586+ <property name="receives_default">False</property>
3587+ <property name="tooltip_text" translatable="yes">Start playback</property>
3588+ <property name="use_stock">True</property>
3589+ <signal name="clicked" handler="on_playButton_clicked"/>
3590+ </object>
3591+ <packing>
3592+ <property name="expand">False</property>
3593+ <property name="position">1</property>
3594+ </packing>
3595+ </child>
3596+ <child>
3597+ <object class="GtkToggleButton" id="recordButton">
3598+ <property name="label">gtk-media-record</property>
3599+ <property name="visible">True</property>
3600+ <property name="can_focus">True</property>
3601+ <property name="receives_default">False</property>
3602+ <property name="tooltip_text" translatable="yes">Start recording</property>
3603+ <property name="use_stock">True</property>
3604+ <signal name="clicked" handler="on_recordButton_clicked"/>
3605+ </object>
3606+ <packing>
3607+ <property name="expand">False</property>
3608+ <property name="position">2</property>
3609+ </packing>
3610+ </child>
3611+ <child>
3612+ <object class="GtkToggleButton" id="abButton">
3613+ <property name="label" translatable="yes">A-B</property>
3614+ <property name="visible">True</property>
3615+ <property name="sensitive">False</property>
3616+ <property name="can_focus">True</property>
3617+ <property name="receives_default">False</property>
3618+ <property name="tooltip_text" translatable="yes">Set the start position for loop playback</property>
3619+ <property name="use_underline">True</property>
3620+ <signal name="clicked" handler="on_abButton_clicked"/>
3621+ </object>
3622+ <packing>
3623+ <property name="expand">False</property>
3624+ <property name="position">3</property>
3625+ </packing>
3626+ </child>
3627+ <child>
3628+ <object class="GtkButton" id="hideShowButton">
3629+ <property name="label" translatable="yes">S_how</property>
3630+ <property name="visible">True</property>
3631+ <property name="can_focus">True</property>
3632+ <property name="receives_default">False</property>
3633+ <property name="tooltip_text" translatable="yes">Show the main Jokosher window</property>
3634+ <property name="use_underline">True</property>
3635+ <signal name="clicked" handler="on_hideShowButton_clicked"/>
3636+ </object>
3637+ <packing>
3638+ <property name="expand">False</property>
3639+ <property name="position">4</property>
3640+ </packing>
3641+ </child>
3642+ <child>
3643+ <object class="GtkButton" id="closeButton">
3644+ <property name="label">gtk-close</property>
3645+ <property name="visible">True</property>
3646+ <property name="can_focus">True</property>
3647+ <property name="receives_default">False</property>
3648+ <property name="use_stock">True</property>
3649+ <signal name="clicked" handler="on_closeButton_clicked"/>
3650+ </object>
3651+ <packing>
3652+ <property name="expand">False</property>
3653+ <property name="position">5</property>
3654+ </packing>
3655+ </child>
3656+ </object>
3657+ <packing>
3658+ <property name="position">0</property>
3659+ </packing>
3660+ </child>
3661+ <child>
3662+ <object class="GtkLabel" id="timeLabel">
3663+ <property name="visible">True</property>
3664+ <property name="xalign">0</property>
3665+ <property name="xpad">5</property>
3666+ <property name="label" translatable="yes">0:00:000</property>
3667+ <property name="use_markup">True</property>
3668+ </object>
3669+ <packing>
3670+ <property name="expand">False</property>
3671+ <property name="fill">False</property>
3672+ <property name="position">1</property>
3673+ </packing>
3674+ </child>
3675+ </object>
3676+ </child>
3677+ </object>
3678+</interface>
3679
3680=== modified file 'extensions/eggs/SetTempo/setup.py'
3681--- extensions/eggs/SetTempo/setup.py 2007-01-03 18:41:07 +0000
3682+++ extensions/eggs/SetTempo/setup.py 2011-02-28 22:41:14 +0000
3683@@ -1,13 +1,13 @@
3684 from setuptools import setup
3685 import sys, os
3686 from shutil import copy
3687-version="0.1"
3688+version="0.11"
3689 setup(name="SetTempo",
3690 version=version,
3691 description="Sets tempo for current project",
3692 packages=["SetTempo"],
3693 package_dir={"SetTempo":"src"},
3694-package_data={"":["SetTempo.glade"]},
3695+package_data={"":["SetTempo.ui"]},
3696 entry_points="""
3697 [jokosher.extensions]
3698 extension = SetTempo:SetTempo
3699
3700=== removed file 'extensions/eggs/SetTempo/src/SetTempo.glade'
3701--- extensions/eggs/SetTempo/src/SetTempo.glade 2007-02-08 00:18:28 +0000
3702+++ extensions/eggs/SetTempo/src/SetTempo.glade 1970-01-01 00:00:00 +0000
3703@@ -1,179 +0,0 @@
3704-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
3705-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
3706-
3707-<glade-interface>
3708-
3709-<widget class="GtkWindow" id="SetTempoDialog">
3710- <property name="border_width">6</property>
3711- <property name="visible">True</property>
3712- <property name="title" translatable="yes">Set Tempo</property>
3713- <property name="type">GTK_WINDOW_TOPLEVEL</property>
3714- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
3715- <property name="modal">False</property>
3716- <property name="resizable">True</property>
3717- <property name="destroy_with_parent">False</property>
3718- <property name="decorated">True</property>
3719- <property name="skip_taskbar_hint">False</property>
3720- <property name="skip_pager_hint">False</property>
3721- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
3722- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
3723- <property name="focus_on_map">True</property>
3724- <property name="urgency_hint">False</property>
3725-
3726- <child>
3727- <widget class="GtkVBox" id="vboxMain">
3728- <property name="visible">True</property>
3729- <property name="homogeneous">True</property>
3730- <property name="spacing">0</property>
3731-
3732- <child>
3733- <widget class="GtkLabel" id="tempoLabel">
3734- <property name="visible">True</property>
3735- <property name="label" translatable="yes">0</property>
3736- <property name="use_underline">False</property>
3737- <property name="use_markup">False</property>
3738- <property name="justify">GTK_JUSTIFY_LEFT</property>
3739- <property name="wrap">False</property>
3740- <property name="selectable">False</property>
3741- <property name="xalign">0.5</property>
3742- <property name="yalign">0.5</property>
3743- <property name="xpad">0</property>
3744- <property name="ypad">0</property>
3745- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
3746- <property name="width_chars">-1</property>
3747- <property name="single_line_mode">False</property>
3748- <property name="angle">0</property>
3749- </widget>
3750- <packing>
3751- <property name="padding">6</property>
3752- <property name="expand">True</property>
3753- <property name="fill">True</property>
3754- </packing>
3755- </child>
3756-
3757- <child>
3758- <widget class="GtkHBox" id="hboxButtons">
3759- <property name="visible">True</property>
3760- <property name="homogeneous">True</property>
3761- <property name="spacing">6</property>
3762-
3763- <child>
3764- <widget class="GtkButton" id="clearButton">
3765- <property name="visible">True</property>
3766- <property name="tooltip" translatable="yes">Press to clear the current bpm value</property>
3767- <property name="can_focus">True</property>
3768- <property name="label" translatable="yes">Clea_r</property>
3769- <property name="use_underline">True</property>
3770- <property name="relief">GTK_RELIEF_NORMAL</property>
3771- <property name="focus_on_click">False</property>
3772- <signal name="clicked" handler="OnClearClicked" last_modification_time="Tue, 19 Dec 2006 20:26:49 GMT"/>
3773- </widget>
3774- <packing>
3775- <property name="padding">0</property>
3776- <property name="expand">False</property>
3777- <property name="fill">True</property>
3778- </packing>
3779- </child>
3780-
3781- <child>
3782- <widget class="GtkButton" id="stopButton">
3783- <property name="visible">True</property>
3784- <property name="tooltip" translatable="yes">Press to stop the currently playing audio</property>
3785- <property name="can_focus">True</property>
3786- <property name="label" translatable="yes">St_op</property>
3787- <property name="use_underline">True</property>
3788- <property name="relief">GTK_RELIEF_NORMAL</property>
3789- <property name="focus_on_click">False</property>
3790- <signal name="clicked" handler="OnStopClicked" last_modification_time="Fri, 22 Dec 2006 01:12:23 GMT"/>
3791- </widget>
3792- <packing>
3793- <property name="padding">0</property>
3794- <property name="expand">False</property>
3795- <property name="fill">True</property>
3796- </packing>
3797- </child>
3798-
3799- <child>
3800- <widget class="GtkButton" id="playButton">
3801- <property name="visible">True</property>
3802- <property name="tooltip" translatable="yes">Press to start playing the current project</property>
3803- <property name="can_focus">True</property>
3804- <property name="label" translatable="yes">_Play</property>
3805- <property name="use_underline">True</property>
3806- <property name="relief">GTK_RELIEF_NORMAL</property>
3807- <property name="focus_on_click">False</property>
3808- <signal name="clicked" handler="OnPlayClicked" last_modification_time="Thu, 21 Dec 2006 18:54:17 GMT"/>
3809- </widget>
3810- <packing>
3811- <property name="padding">0</property>
3812- <property name="expand">False</property>
3813- <property name="fill">True</property>
3814- </packing>
3815- </child>
3816-
3817- <child>
3818- <widget class="GtkButton" id="tapButton">
3819- <property name="visible">True</property>
3820- <property name="tooltip" translatable="yes">Tap this button in time with the audio playing to set the tempo (bpm)</property>
3821- <property name="can_focus">True</property>
3822- <property name="has_focus">True</property>
3823- <property name="label" translatable="yes">_Tap</property>
3824- <property name="use_underline">True</property>
3825- <property name="relief">GTK_RELIEF_NORMAL</property>
3826- <property name="focus_on_click">True</property>
3827- <signal name="clicked" handler="OnTapClicked" last_modification_time="Tue, 19 Dec 2006 20:26:40 GMT"/>
3828- </widget>
3829- <packing>
3830- <property name="padding">0</property>
3831- <property name="expand">False</property>
3832- <property name="fill">True</property>
3833- </packing>
3834- </child>
3835-
3836- <child>
3837- <widget class="GtkButton" id="setButton">
3838- <property name="visible">True</property>
3839- <property name="tooltip" translatable="yes">Sets the tempo value for the current project from the bpm currently displayed</property>
3840- <property name="can_focus">True</property>
3841- <property name="label" translatable="yes">_Set</property>
3842- <property name="use_underline">True</property>
3843- <property name="relief">GTK_RELIEF_NORMAL</property>
3844- <property name="focus_on_click">False</property>
3845- <signal name="clicked" handler="OnSetClicked" last_modification_time="Tue, 19 Dec 2006 20:27:07 GMT"/>
3846- </widget>
3847- <packing>
3848- <property name="padding">0</property>
3849- <property name="expand">False</property>
3850- <property name="fill">True</property>
3851- </packing>
3852- </child>
3853-
3854- <child>
3855- <widget class="GtkButton" id="cancelButton">
3856- <property name="visible">True</property>
3857- <property name="tooltip" translatable="yes">Cancels this dialog</property>
3858- <property name="can_focus">True</property>
3859- <property name="label" translatable="yes">_Cancel</property>
3860- <property name="use_underline">True</property>
3861- <property name="relief">GTK_RELIEF_NORMAL</property>
3862- <property name="focus_on_click">False</property>
3863- <signal name="clicked" handler="OnCancelClicked" last_modification_time="Tue, 19 Dec 2006 20:27:33 GMT"/>
3864- </widget>
3865- <packing>
3866- <property name="padding">0</property>
3867- <property name="expand">False</property>
3868- <property name="fill">True</property>
3869- </packing>
3870- </child>
3871- </widget>
3872- <packing>
3873- <property name="padding">0</property>
3874- <property name="expand">True</property>
3875- <property name="fill">False</property>
3876- </packing>
3877- </child>
3878- </widget>
3879- </child>
3880-</widget>
3881-
3882-</glade-interface>
3883
3884=== removed file 'extensions/eggs/SetTempo/src/SetTempo.gladep'
3885--- extensions/eggs/SetTempo/src/SetTempo.gladep 2007-01-03 18:41:07 +0000
3886+++ extensions/eggs/SetTempo/src/SetTempo.gladep 1970-01-01 00:00:00 +0000
3887@@ -1,8 +0,0 @@
3888-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
3889-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
3890-
3891-<glade-project>
3892- <name></name>
3893- <program_name></program_name>
3894- <gnome_support>FALSE</gnome_support>
3895-</glade-project>
3896
3897=== modified file 'extensions/eggs/SetTempo/src/SetTempo.py'
3898--- extensions/eggs/SetTempo/src/SetTempo.py 2010-07-16 15:12:23 +0000
3899+++ extensions/eggs/SetTempo/src/SetTempo.py 2011-02-28 22:41:14 +0000
3900@@ -4,7 +4,6 @@
3901 # by playing it back and tapping the space bar in time with the beat.
3902 import Jokosher.Extension
3903 import gtk
3904-import gtk.glade
3905 import pkg_resources
3906 import time
3907
3908@@ -24,7 +23,7 @@
3909 """
3910 EXTENSION_NAME = "Set Tempo"
3911 EXTENSION_DESCRIPTION = "Sets the tempo for the current project by tapping in time with the music"
3912- EXTENSION_VERSION = "0.9"
3913+ EXTENSION_VERSION = "0.11"
3914
3915 # The number of past intervals it will store to perform a "rolling" average.
3916 ROLLING_SAMPLE_SIZE = 4
3917@@ -61,12 +60,13 @@
3918 Parameters:
3919 arg -- set by GTK
3920 """
3921- xmlString = pkg_resources.resource_string(__name__, "SetTempo.glade")
3922- wTree = gtk.glade.xml_new_from_buffer(xmlString, len(xmlString))
3923+ xmlString = pkg_resources.resource_string(__name__, "SetTempo.ui")
3924+ gtkBuilder = gtk.Builder()
3925+ gtkBuilder.add_from_string(xmlString)
3926
3927- self.window = wTree.get_widget("SetTempoDialog")
3928+ self.window = gtkBuilder.get_object("SetTempoDialog")
3929 self.API.set_window_icon(self.window)
3930- self.tempoLabel = wTree.get_widget("tempoLabel")
3931+ self.tempoLabel = gtkBuilder.get_object("tempoLabel")
3932 signals = {
3933 "OnClearClicked" : self.OnClear,
3934 "OnStopClicked" : self.OnStop,
3935@@ -75,7 +75,7 @@
3936 "OnSetClicked" : self.OnSet,
3937 "OnCancelClicked" : self.OnCancel
3938 }
3939- wTree.signal_autoconnect(signals)
3940+ gtkBuilder.connect_signals(signals)
3941
3942 self.window.set_transient_for(self.API.mainapp.window)
3943 self.WriteLabel(0)
3944
3945=== added file 'extensions/eggs/SetTempo/src/SetTempo.ui'
3946--- extensions/eggs/SetTempo/src/SetTempo.ui 1970-01-01 00:00:00 +0000
3947+++ extensions/eggs/SetTempo/src/SetTempo.ui 2011-02-28 22:41:14 +0000
3948@@ -0,0 +1,135 @@
3949+<?xml version="1.0" encoding="UTF-8"?>
3950+<interface>
3951+ <requires lib="gtk+" version="2.16"/>
3952+ <!-- interface-naming-policy toplevel-contextual -->
3953+ <object class="GtkWindow" id="SetTempoDialog">
3954+ <property name="visible">True</property>
3955+ <property name="border_width">6</property>
3956+ <property name="title" translatable="yes">Set Tempo</property>
3957+ <property name="window_position">center-on-parent</property>
3958+ <property name="type_hint">dialog</property>
3959+ <child>
3960+ <object class="GtkVBox" id="vboxMain">
3961+ <property name="visible">True</property>
3962+ <property name="homogeneous">True</property>
3963+ <child>
3964+ <object class="GtkLabel" id="tempoLabel">
3965+ <property name="visible">True</property>
3966+ <property name="label" translatable="yes">0</property>
3967+ </object>
3968+ <packing>
3969+ <property name="padding">6</property>
3970+ <property name="position">0</property>
3971+ </packing>
3972+ </child>
3973+ <child>
3974+ <object class="GtkHBox" id="hboxButtons">
3975+ <property name="visible">True</property>
3976+ <property name="spacing">6</property>
3977+ <property name="homogeneous">True</property>
3978+ <child>
3979+ <object class="GtkButton" id="clearButton">
3980+ <property name="label" translatable="yes">Clea_r</property>
3981+ <property name="visible">True</property>
3982+ <property name="can_focus">True</property>
3983+ <property name="receives_default">False</property>
3984+ <property name="tooltip_text" translatable="yes">Press to clear the current bpm value</property>
3985+ <property name="use_underline">True</property>
3986+ <property name="focus_on_click">False</property>
3987+ <signal name="clicked" handler="OnClearClicked"/>
3988+ </object>
3989+ <packing>
3990+ <property name="expand">False</property>
3991+ <property name="position">0</property>
3992+ </packing>
3993+ </child>
3994+ <child>
3995+ <object class="GtkButton" id="stopButton">
3996+ <property name="label" translatable="yes">St_op</property>
3997+ <property name="visible">True</property>
3998+ <property name="can_focus">True</property>
3999+ <property name="receives_default">False</property>
4000+ <property name="tooltip_text" translatable="yes">Press to stop the currently playing audio</property>
4001+ <property name="use_underline">True</property>
4002+ <property name="focus_on_click">False</property>
4003+ <signal name="clicked" handler="OnStopClicked"/>
4004+ </object>
4005+ <packing>
4006+ <property name="expand">False</property>
4007+ <property name="position">1</property>
4008+ </packing>
4009+ </child>
4010+ <child>
4011+ <object class="GtkButton" id="playButton">
4012+ <property name="label" translatable="yes">_Play</property>
4013+ <property name="visible">True</property>
4014+ <property name="can_focus">True</property>
4015+ <property name="receives_default">False</property>
4016+ <property name="tooltip_text" translatable="yes">Press to start playing the current project</property>
4017+ <property name="use_underline">True</property>
4018+ <property name="focus_on_click">False</property>
4019+ <signal name="clicked" handler="OnPlayClicked"/>
4020+ </object>
4021+ <packing>
4022+ <property name="expand">False</property>
4023+ <property name="position">2</property>
4024+ </packing>
4025+ </child>
4026+ <child>
4027+ <object class="GtkButton" id="tapButton">
4028+ <property name="label" translatable="yes">_Tap</property>
4029+ <property name="visible">True</property>
4030+ <property name="can_focus">True</property>
4031+ <property name="has_focus">True</property>
4032+ <property name="receives_default">False</property>
4033+ <property name="tooltip_text" translatable="yes">Tap this button in time with the audio playing to set the tempo (bpm)</property>
4034+ <property name="use_underline">True</property>
4035+ <signal name="clicked" handler="OnTapClicked"/>
4036+ </object>
4037+ <packing>
4038+ <property name="expand">False</property>
4039+ <property name="position">3</property>
4040+ </packing>
4041+ </child>
4042+ <child>
4043+ <object class="GtkButton" id="setButton">
4044+ <property name="label" translatable="yes">_Set</property>
4045+ <property name="visible">True</property>
4046+ <property name="can_focus">True</property>
4047+ <property name="receives_default">False</property>
4048+ <property name="tooltip_text" translatable="yes">Sets the tempo value for the current project from the bpm currently displayed</property>
4049+ <property name="use_underline">True</property>
4050+ <property name="focus_on_click">False</property>
4051+ <signal name="clicked" handler="OnSetClicked"/>
4052+ </object>
4053+ <packing>
4054+ <property name="expand">False</property>
4055+ <property name="position">4</property>
4056+ </packing>
4057+ </child>
4058+ <child>
4059+ <object class="GtkButton" id="cancelButton">
4060+ <property name="label" translatable="yes">_Cancel</property>
4061+ <property name="visible">True</property>
4062+ <property name="can_focus">True</property>
4063+ <property name="receives_default">False</property>
4064+ <property name="tooltip_text" translatable="yes">Cancels this dialog</property>
4065+ <property name="use_underline">True</property>
4066+ <property name="focus_on_click">False</property>
4067+ <signal name="clicked" handler="OnCancelClicked"/>
4068+ </object>
4069+ <packing>
4070+ <property name="expand">False</property>
4071+ <property name="position">5</property>
4072+ </packing>
4073+ </child>
4074+ </object>
4075+ <packing>
4076+ <property name="fill">False</property>
4077+ <property name="position">1</property>
4078+ </packing>
4079+ </child>
4080+ </object>
4081+ </child>
4082+ </object>
4083+</interface>

Subscribers

People subscribed via source and target branches