Navigation

← Previous Changeset
Next Changeset →

Changeset 566

Timestamp:

02/24/07 18:18:04 (2 years ago)

Author:

nicfit

Message:

Pref and plugin cleanups

Files:

trunk/configure.ac (modified) (1 diff)
trunk/etc/mesk-0.3.0.ebuild (modified) (2 diffs)
trunk/src/audio_control.py (modified) (1 diff)
trunk/src/data/glade/playlist.glade (modified) (3 diffs)
trunk/src/data/glade/preference_window.glade (modified) (1 diff)
trunk/src/main_window.py (modified) (2 diffs)
trunk/src/mesk/plugin/__init__.py (modified) (1 diff)
trunk/src/plugins/audioscrobbler.py (modified) (2 diffs)
trunk/src/plugins/gajimstatus.py (modified) (2 diffs)
trunk/src/plugins/plugins_gui.glade (modified) (9 diffs)
trunk/src/preference_window.py (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/configure.ac

r564	r566
124	124	PKG_CHECK_MODULES([hal], [hal >= 0.5.7])
125	125	ACX_CHECK_CDDB_PY([1.4])
126		AC_CHECK_PROG([have_eject], [eJect], [yes], [no])
	126	AC_CHECK_PROG([have_eject], [eject], [yes], [no])
127	127	if test "$have_eject" = "no"; then
128	128	AC_MSG_ERROR(

trunk/etc/mesk-0.3.0.ebuild

r559	r566
16	16	# Runtime deps
17	17	RDEPEND=">=dev-lang/python-2.4
18		~~>=x11-libs/gtk+-2.10~~
19	18	>=dev-python/pygtk-2.10
	19	=>gnome-base/librsvg-2.16.0
20	20	>=sys-apps/dbus-1.0.0
21	21	>=dev-libs/dbus-glib-0.72
22		>=dev-python/dbus-python-0.71
23		=media-libs/gstreamer-0.10*
	22	>=dev-python/dbus-python-0.80
24	23	=dev-python/gst-python-0.10*
25	24	=media-plugins/gst-plugins-gnomevfs-0.10*
26	25	=media-libs/gst-plugins-good-0.10*
27		=gnome-base/librsvg-2.16*
28	26	=sys-apps/hal-0.5.7-r3
29	27	=>sys-apps/eject-2.1.5
…	…
55	53	fdo-mime_mime_database_update
56	54	fdo-mime_desktop_database_update
	55	# FIXME
	56	# python_version
	57	# python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages/gst-0.10
57	58	}
	59
	60	pkg_postrm() {
	61	# FIXME
	62	#python_version
	63	#python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages/gst-0.10
	64	}

trunk/src/audio_control.py

r556	r566
550	550
551	551	name = audio_sink = None
	552	# Try and locate the preferred sink, and falback from best to worst, IMO
552	553	for sink in [config_sink, mesk.GST_GCONF, mesk.GST_AUTO_SINK,
553	554	mesk.GST_ALSA, mesk.GST_ESD]:

trunk/src/data/glade/playlist.glade

r534	r566
58	58	<property name="window_position">GTK_WIN_POS_MOUSE</property>
59	59	<property name="modal">True</property>
	60	<property name="default_width">640</property>
60	61	<property name="resizable">False</property>
61	62	<property name="destroy_with_parent">False</property>
…	…
206	207
207	208	<child>
208		<widget class="GtkFrame" id="frame1">
209		<property name="visible">True</property>
210		<property name="label_xalign">0</property>
211		<property name="label_yalign">0.5</property>
212		<property name="shadow_type">GTK_SHADOW_NONE</property>
	209	<widget class="GtkVBox" id="vbox1">
	210	<property name="visible">True</property>
	211	<property name="homogeneous">False</property>
	212	<property name="spacing">0</property>
213	213
214	214	<child>
215		<widget class="Gtk~~Alignment" id="alignment13~~">
	215	<widget class="GtkFrame" id="frame1">
216	216	<property name="visible">True</property>
217		<property name="xalign">0.5</property>
218		<property name="yalign">0.5</property>
219		<property name="xscale">1</property>
220		<property name="yscale">1</property>
221		<property name="top_padding">0</property>
222		<property name="bottom_padding">0</property>
223		<property name="left_padding">0</property>
224		<property name="right_padding">0</property>
	217	<property name="label_xalign">0</property>
	218	<property name="label_yalign">0.5</property>
	219	<property name="shadow_type">GTK_SHADOW_NONE</property>
225	220
226	221	<child>
227		<widget class="Gtk~~ScrolledWindow" id="scrolledwindow1~~">
	222	<widget class="GtkAlignment" id="alignment13">
228	223	<property name="visible">True</property>
229		<property name="can_focus">True</property>
230		<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
231		<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
232		<property name="shadow_type">GTK_SHADOW_IN</property>
233		<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
	224	<property name="xalign">0.5</property>
	225	<property name="yalign">0.5</property>
	226	<property name="xscale">1</property>
	227	<property name="yscale">1</property>
	228	<property name="top_padding">0</property>
	229	<property name="bottom_padding">0</property>
	230	<property name="left_padding">0</property>
	231	<property name="right_padding">0</property>
234	232
235	233	<child>
236		<widget class="Gtk~~TextView" id="playlist_annotation_textview~~">
	234	<widget class="GtkScrolledWindow" id="scrolledwindow1">
237	235	<property name="visible">True</property>
238	236	<property name="can_focus">True</property>
239		<property name="editable">True</property>
240		<property name="overwrite">False</property>
241		<property name="accepts_tab">False</property>
242		<property name="justification">GTK_JUSTIFY_LEFT</property>
243		<property name="wrap_mode">GTK_WRAP_NONE</property>
244		<property name="cursor_visible">True</property>
245		<property name="pixels_above_lines">0</property>
246		<property name="pixels_below_lines">0</property>
247		<property name="pixels_inside_wrap">0</property>
248		<property name="left_margin">0</property>
249		<property name="right_margin">0</property>
250		<property name="indent">0</property>
251		<property name="text" translatable="yes"></property>
	237	<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	238	<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	239	<property name="shadow_type">GTK_SHADOW_IN</property>
	240	<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
	241
	242	<child>
	243	<widget class="GtkTextView" id="playlist_annotation_textview">
	244	<property name="visible">True</property>
	245	<property name="can_focus">True</property>
	246	<property name="editable">True</property>
	247	<property name="overwrite">False</property>
	248	<property name="accepts_tab">False</property>
	249	<property name="justification">GTK_JUSTIFY_LEFT</property>
	250	<property name="wrap_mode">GTK_WRAP_NONE</property>
	251	<property name="cursor_visible">True</property>
	252	<property name="pixels_above_lines">0</property>
	253	<property name="pixels_below_lines">0</property>
	254	<property name="pixels_inside_wrap">0</property>
	255	<property name="left_margin">0</property>
	256	<property name="right_margin">0</property>
	257	<property name="indent">0</property>
	258	<property name="text" translatable="yes"></property>
	259	</widget>
	260	</child>
252	261	</widget>
253	262	</child>
254	263	</widget>
255	264	</child>
256		</widget>
257		</child>
258
259		<child>
260		<widget class="GtkLabel" id="label22">
261		<property name="visible">True</property>
262		<property name="label" translatable="yes"><b>Comments:</b></property>
263		<property name="use_underline">False</property>
264		<property name="use_markup">True</property>
265		<property name="justify">GTK_JUSTIFY_LEFT</property>
266		<property name="wrap">False</property>
267		<property name="selectable">False</property>
268		<property name="xalign">0.5</property>
269		<property name="yalign">0.5</property>
270		<property name="xpad">0</property>
271		<property name="ypad">0</property>
272		<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
273		<property name="width_chars">-1</property>
274		<property name="single_line_mode">False</property>
275		<property name="angle">0</property>
	265
	266	<child>
	267	<widget class="GtkLabel" id="label22">
	268	<property name="visible">True</property>
	269	<property name="label" translatable="yes"><b>Comments:</b></property>
	270	<property name="use_underline">False</property>
	271	<property name="use_markup">True</property>
	272	<property name="justify">GTK_JUSTIFY_LEFT</property>
	273	<property name="wrap">False</property>
	274	<property name="selectable">False</property>
	275	<property name="xalign">0.5</property>
	276	<property name="yalign">0.5</property>
	277	<property name="xpad">0</property>
	278	<property name="ypad">0</property>
	279	<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
	280	<property name="width_chars">-1</property>
	281	<property name="single_line_mode">False</property>
	282	<property name="angle">0</property>
	283	</widget>
	284	<packing>
	285	<property name="type">label_item</property>
	286	</packing>
	287	</child>
276	288	</widget>
277	289	<packing>
278		<property name="type">label_item</property>
	290	<property name="padding">0</property>
	291	<property name="expand">True</property>
	292	<property name="fill">True</property>
	293	</packing>
	294	</child>
	295
	296	<child>
	297	<widget class="GtkCheckButton" id="read_only_checkbutton">
	298	<property name="visible">True</property>
	299	<property name="can_focus">True</property>
	300	<property name="label" translatable="yes">Read Only</property>
	301	<property name="use_underline">True</property>
	302	<property name="relief">GTK_RELIEF_NORMAL</property>
	303	<property name="focus_on_click">True</property>
	304	<property name="active">False</property>
	305	<property name="inconsistent">False</property>
	306	<property name="draw_indicator">True</property>
	307	</widget>
	308	<packing>
	309	<property name="padding">0</property>
	310	<property name="expand">False</property>
	311	<property name="fill">False</property>
279	312	</packing>
280	313	</child>
…	…
482	515	<widget class="GtkImageMenuItem" id="add_menuitem">
483	516	<property name="visible">True</property>
484		<property name="label" translatable="yes">_Add ~~Music~~...</property>
	517	<property name="label" translatable="yes">_Add...</property>
485	518	<property name="use_underline">True</property>
486	519	<signal name="activate" handler="_on_add_menuitem_activate"/>

trunk/src/data/glade/preference_window.glade

r561	r566
1		<?xml version="1.0" ~~encoding="UTF-8" standalone="no"?~~>
2		<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
3		<!--- mode: xml --->
	1	<?xml version="1.0" standalone="no"?> <!--- mode: xml --->
	2	<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
	3
4	4	<glade-interface>
5		<widget class="GtkWindow" id="preference_window">
6		<property name="title">Preferences</property>
7		<property name="role">PreferenceWindow</property>
8		<property name="window_position">GTK_WIN_POS_CENTER</property>
9		<property name="default_width">640</property>
10		<property name="default_height">480</property>
11		<signal name="delete_event" handler="_on_window_delete_event"/>
12		<child>
13		<widget class="GtkVBox" id="pref_vbox">
14		<property name="visible">True</property>
15		<child>
16		<widget class="GtkNotebook" id="pref_notebook">
17		<property name="visible">True</property>
18		<property name="can_focus">True</property>
19		<child>
20		<widget class="GtkHBox" id="plugins_hbox">
21		<property name="visible">True</property>
22		<child>
23		<widget class="GtkVBox" id="vbox3">
24		<property name="visible">True</property>
25		<child>
26		<widget class="GtkHBox" id="hbox8">
27		<property name="visible">True</property>
28		<child>
29		<widget class="GtkScrolledWindow" id="scrolledwindow1">
30		<property name="visible">True</property>
31		<property name="can_focus">True</property>
32		<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
33		<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
34		<property name="shadow_type">GTK_SHADOW_IN</property>
35		<child>
36		<widget class="GtkTreeView" id="plugins_treeview">
37		<property name="visible">True</property>
38		<property name="can_focus">True</property>
39		<signal name="cursor_changed" handler="_on_plugins_treeview_cursor_changed"/>
40		</widget>
41		</child>
42		</widget>
43		</child>
44		<child>
45		<widget class="GtkNotebook" id="notebook1">
46		<property name="visible">True</property>
47		<property name="show_tabs">False</property>
48		<property name="show_border">False</property>
49		<child>
50		<widget class="GtkVBox" id="vbox6">
51		<property name="visible">True</property>
52		<child>
53		<widget class="GtkAlignment" id="alignment10">
54		<property name="visible">True</property>
55		<property name="top_padding">10</property>
56		<property name="bottom_padding">10</property>
57		<property name="left_padding">2</property>
58		<property name="right_padding">2</property>
59		<child>
60		<widget class="GtkHBox" id="hbox9">
61		<property name="visible">True</property>
62		<child>
63		<widget class="GtkImage" id="plugin_image">
64		<property name="visible">True</property>
65		<property name="stock">gtk-missing-image</property>
66		</widget>
67		<packing>
68		<property name="expand">False</property>
69		<property name="fill">False</property>
70		</packing>
71		</child>
72		<child>
73		<widget class="GtkLabel" id="name_label">
74		<property name="visible">True</property>
75		<property name="label" translatable="yes"><b>Plugin Name</b></property>
76		<property name="use_markup">True</property>
77		</widget>
78		<packing>
79		<property name="padding">5</property>
80		<property name="position">1</property>
81		</packing>
82		</child>
83		</widget>
84		</child>
85		</widget>
86		<packing>
87		<property name="expand">False</property>
88		<property name="fill">False</property>
89		</packing>
90		</child>
91		<child>
92		<widget class="GtkVBox" id="vbox7">
93		<property name="visible">True</property>
94		<property name="spacing">4</property>
95		<child>
96		<widget class="GtkFrame" id="frame1">
97		<property name="visible">True</property>
98		<property name="label_xalign">0</property>
99		<property name="shadow_type">GTK_SHADOW_NONE</property>
100		<child>
101		<widget class="GtkAlignment" id="alignment11">
102		<property name="visible">True</property>
103		<property name="left_padding">12</property>
104		<child>
105		<widget class="GtkLabel" id="description_label">
106		<property name="visible">True</property>
107		<property name="xalign">0</property>
108		<property name="label" translatable="yes"><span size="xx-large" weight="bold">Mesk 1.0</span></property>
109		<property name="wrap">True</property>
110		</widget>
111		</child>
112		</widget>
113		</child>
114		<child>
115		<widget class="GtkLabel" id="label21">
116		<property name="visible">True</property>
117		<property name="label" translatable="yes"><b>Description</b></property>
118		<property name="use_markup">True</property>
119		</widget>
120		<packing>
121		<property name="type">label_item</property>
122		</packing>
123		</child>
124		</widget>
125		<packing>
126		<property name="expand">False</property>
127		</packing>
128		</child>
129		<child>
130		<widget class="GtkFrame" id="frame2">
131		<property name="visible">True</property>
132		<property name="label_xalign">0</property>
133		<property name="shadow_type">GTK_SHADOW_NONE</property>
134		<child>
135		<widget class="GtkAlignment" id="alignment12">
136		<property name="visible">True</property>
137		<property name="left_padding">12</property>
138		<child>
139		<widget class="GtkLabel" id="author_label">
140		<property name="visible">True</property>
141		<property name="xalign">0</property>
142		<property name="wrap">True</property>
143		</widget>
144		</child>
145		</widget>
146		</child>
147		<child>
148		<widget class="GtkLabel" id="label22">
149		<property name="visible">True</property>
150		<property name="label" translatable="yes"><b>Author</b></property>
151		<property name="use_markup">True</property>
152		</widget>
153		<packing>
154		<property name="type">label_item</property>
155		</packing>
156		</child>
157		</widget>
158		<packing>
159		<property name="expand">False</property>
160		<property name="position">1</property>
161		</packing>
162		</child>
163		<child>
164		<widget class="GtkFrame" id="frame3">
165		<property name="visible">True</property>
166		<property name="label_xalign">0</property>
167		<property name="shadow_type">GTK_SHADOW_NONE</property>
168		<child>
169		<widget class="GtkAlignment" id="alignment13">
170		<property name="visible">True</property>
171		<property name="left_padding">12</property>
172		<child>
173		<widget class="GtkLabel" id="copyright_label">
174		<property name="visible">True</property>
175		<property name="xalign">0</property>
176		<property name="wrap">True</property>
177		</widget>
178		</child>
179		</widget>
180		</child>
181		<child>
182		<widget class="GtkLabel" id="label23">
183		<property name="visible">True</property>
184		<property name="label" translatable="yes"><b>Copyright</b></property>
185		<property name="use_markup">True</property>
186		</widget>
187		<packing>
188		<property name="type">label_item</property>
189		</packing>
190		</child>
191		</widget>
192		<packing>
193		<property name="expand">False</property>
194		<property name="position">2</property>
195		</packing>
196		</child>
197		<child>
198		<widget class="GtkFrame" id="frame4">
199		<property name="visible">True</property>
200		<property name="label_xalign">0</property>
201		<property name="shadow_type">GTK_SHADOW_NONE</property>
202		<child>
203		<widget class="GtkAlignment" id="alignment14">
204		<property name="visible">True</property>
205		<property name="left_padding">12</property>
206		<child>
207		<widget class="GtkLinkButton" id="url_linkbutton">
208		<property name="visible">True</property>
209		<property name="label" translatable="yes">URL</property>
210		<property name="xalign">0</property>
211		<property name="uri"></property>
212		</widget>
213		</child>
214		</widget>
215		</child>
216		<child>
217		<widget class="GtkLabel" id="label24">
218		<property name="visible">True</property>
219		<property name="label" translatable="yes"><b>More Info</b></property>
220		<property name="use_markup">True</property>
221		</widget>
222		<packing>
223		<property name="type">label_item</property>
224		</packing>
225		</child>
226		</widget>
227		<packing>
228		<property name="expand">False</property>
229		<property name="position">3</property>
230		</packing>
231		</child>
232		</widget>
233		<packing>
234		<property name="position">1</property>
235		</packing>
236		</child>
237		<child>
238		<widget class="GtkAlignment" id="alignment9">
239		<property name="visible">True</property>
240		<property name="top_padding">10</property>
241		<child>
242		<widget class="GtkHButtonBox" id="hbuttonbox4">
243		<property name="visible">True</property>
244		<child>
245		<widget class="GtkButton" id="plugin_config_button">
246		<property name="visible">True</property>
247		<property name="sensitive">False</property>
248		<property name="can_focus">True</property>
249		<property name="can_default">True</property>
250		<signal name="clicked" handler="_on_plugin_config_button_clicked"/>
251		<child>
252		<widget class="GtkAlignment" id="alignment7">
253		<property name="visible">True</property>
254		<property name="xscale">0</property>
255		<property name="yscale">0</property>
256		<child>
257		<widget class="GtkHBox" id="hbox10">
258		<property name="visible">True</property>
259		<property name="spacing">2</property>
260		<child>
261		<widget class="GtkImage" id="image27">
262		<property name="visible">True</property>
263		<property name="stock">gtk-preferences</property>
264		</widget>
265		<packing>
266		<property name="expand">False</property>
267		<property name="fill">False</property>
268		</packing>
269		</child>
270		<child>
271		<widget class="GtkLabel" id="label16">
272		<property name="visible">True</property>
273		<property name="label" translatable="yes">Configure...</property>
274		<property name="use_underline">True</property>
275		</widget>
276		<packing>
277		<property name="expand">False</property>
278		<property name="fill">False</property>
279		<property name="position">1</property>
280		</packing>
281		</child>
282		</widget>
283		</child>
284		</widget>
285		</child>
286		</widget>
287		</child>
288		</widget>
289		</child>
290		</widget>
291		<packing>
292		<property name="expand">False</property>
293		<property name="fill">False</property>
294		<property name="position">2</property>
295		</packing>
296		</child>
297		</widget>
298		<packing>
299		<property name="tab_expand">False</property>
300		<property name="tab_fill">False</property>
301		</packing>
302		</child>
303		<child>
304		<widget class="GtkLabel" id="label16">
305		<property name="visible">True</property>
306		<property name="label" translatable="yes">label16</property>
307		</widget>
308		<packing>
309		<property name="type">tab</property>
310		<property name="tab_expand">False</property>
311		<property name="tab_fill">False</property>
312		</packing>
313		</child>
314		<child>
315		<placeholder/>
316		</child>
317		<child>
318		<widget class="GtkLabel" id="label17">
319		<property name="visible">True</property>
320		<property name="label" translatable="yes">label17</property>
321		</widget>
322		<packing>
323		<property name="type">tab</property>
324		<property name="position">1</property>
325		<property name="tab_expand">False</property>
326		<property name="tab_fill">False</property>
327		</packing>
328		</child>
329		</widget>
330		<packing>
331		<property name="expand">False</property>
332		<property name="padding">5</property>
333		<property name="pack_type">GTK_PACK_END</property>
334		<property name="position">1</property>
335		</packing>
336		</child>
337		</widget>
338		</child>
339		</widget>
340		</child>
341		</widget>
342		<packing>
343		<property name="tab_expand">False</property>
344		</packing>
345		</child>
346		<child>
347		<widget class="GtkHBox" id="plugins_tab_label_hbox">
348		<property name="visible">True</property>
349		<child>
350		<widget class="GtkImage" id="image23">
351		<property name="visible">True</property>
352		<property name="icon_name">stock_insert-plugin</property>
353		</widget>
354		</child>
355		<child>
356		<widget class="GtkLabel" id="label11">
357		<property name="visible">True</property>
358		<property name="label" translatable="yes">Plugins</property>
359		</widget>
360		<packing>
361		<property name="expand">False</property>
362		<property name="fill">False</property>
363		<property name="position">1</property>
364		</packing>
365		</child>
366		</widget>
367		<packing>