christine-commits Mailing List for Christine Media Player (Page 21)
Status: Beta
Brought to you by:
thesystems
Menu
▾
▴
christine-commits — SVN Commits, for developers.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
(12) |
Apr
(32) |
May
(25) |
Jun
(11) |
Jul
(29) |
Aug
(37) |
Sep
(23) |
Oct
(2) |
Nov
(1) |
Dec
(13) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(1) |
Feb
(17) |
Mar
(9) |
Apr
(5) |
May
(15) |
Jun
(6) |
Jul
|
Aug
(2) |
Sep
(25) |
Oct
(31) |
Nov
(24) |
Dec
(11) |
| 2009 |
Jan
(14) |
Feb
(12) |
Mar
(6) |
Apr
(10) |
May
(2) |
Jun
|
Jul
(36) |
Aug
(4) |
Sep
(11) |
Oct
(17) |
Nov
(4) |
Dec
(12) |
| 2010 |
Jan
(3) |
Feb
|
Mar
(27) |
Apr
(11) |
May
(13) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <the...@us...> - 2007-04-07 15:13:31
|
Revision: 328
http://christine.svn.sourceforge.net/christine/?rev=328&view=rev
Author: thesystems
Date: 2007-04-07 08:13:29 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
Finished the import and initialization of dbus
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-06 19:05:41 UTC (rev 327)
+++ trunk/christine/ChangeLog 2007-04-07 15:13:29 UTC (rev 328)
@@ -1,3 +1,6 @@
+2007-04-07 Marco Antonio Islas Cruz <ma...@is...>
+ * libchristine/Christine.py.in:
+ - Finished the import and initialization of dbus
2007-04-06 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Christine.py.in:
- Support for internet radio stations that use the
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-06 19:05:41 UTC (rev 327)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-07 15:13:29 UTC (rev 328)
@@ -47,6 +47,11 @@
from libchristine.Share import *
from libchristine.ChristineGConf import *
+
+from dbus.mainloop.glib import DBusGMainLoop
+
+DBusGMainLoop(set_as_default=True)
+
SYSTEM_BUS = dbus.SystemBus()
#SYSTEM_BUS = dbus.SessionBus()
@@ -76,7 +81,7 @@
initialize class variables and create some timeouts calls
"""
GtkMisc.__init__(self)
- #dbus.service.Object.__init__(self,SYSTEM_BUS,"/org/christine")
+ dbus.service.Object.__init__(self,SYSTEM_BUS,"/org/christine")
self.__Share = Share()
#print 'SHARE IDENTIFY: ', self.__Share.getId()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-06 19:05:42
|
Revision: 327
http://christine.svn.sourceforge.net/christine/?rev=327&view=rev
Author: thesystems
Date: 2007-04-06 12:05:41 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
import and initialization of dbus
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-06 18:40:21 UTC (rev 326)
+++ trunk/christine/ChangeLog 2007-04-06 19:05:41 UTC (rev 327)
@@ -2,6 +2,7 @@
* libchristine/Christine.py.in:
- Support for internet radio stations that use the
m3u file format.
+ - Import and initialization of Dbus
2007-04-05 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Christine.py.in:
- Support for somafm (and all .pls radio stations)
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-06 18:40:21 UTC (rev 326)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-06 19:05:41 UTC (rev 327)
@@ -33,6 +33,8 @@
import gtk.gdk
import pygst; pygst.require('0.10')
import gst.interfaces
+import dbus
+import dbus.service
from libchristine.Translator import *
from libchristine.GtkMisc import *
from libchristine.Library import *
@@ -45,6 +47,9 @@
from libchristine.Share import *
from libchristine.ChristineGConf import *
+SYSTEM_BUS = dbus.SystemBus()
+#SYSTEM_BUS = dbus.SessionBus()
+
try:
import pynotify
pynotify.Urgency(pynotify.URGENCY_NORMAL)
@@ -63,7 +68,7 @@
print translate('Gtk+ 2.10 or better is required')
sys.exit()
-class Christine(GtkMisc):
+class Christine(GtkMisc,dbus.service.Object):
def __init__(self):
"""
Constructor, this method will init the gtk_misc parent class,
@@ -71,6 +76,7 @@
initialize class variables and create some timeouts calls
"""
GtkMisc.__init__(self)
+ #dbus.service.Object.__init__(self,SYSTEM_BUS,"/org/christine")
self.__Share = Share()
#print 'SHARE IDENTIFY: ', self.__Share.getId()
@@ -1845,9 +1851,7 @@
self.goNext()
sites = [k for k in lines if k[0:4] == "http"]
tl,name = ":".join(lines[1].split(":")[1:]).split(",")
- print tl, name
self.__Display.setSong(name)
- print sites
if len(sites) > 0:
location = sites[0].strip("\r").strip("\n").strip()
#gate = urllib.FancyURLopener()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-06 18:40:36
|
Revision: 326
http://christine.svn.sourceforge.net/christine/?rev=326&view=rev
Author: thesystems
Date: 2007-04-06 11:40:21 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Support for internet radio stations that use the m3u file format
Modified Paths:
--------------
trunk/christine/ChangeLog
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-06 18:40:12 UTC (rev 325)
+++ trunk/christine/ChangeLog 2007-04-06 18:40:21 UTC (rev 326)
@@ -1,3 +1,7 @@
+2007-04-06 Marco Antonio Islas Cruz <ma...@is...>
+ * libchristine/Christine.py.in:
+ - Support for internet radio stations that use the
+ m3u file format.
2007-04-05 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Christine.py.in:
- Support for somafm (and all .pls radio stations)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-06 18:40:26
|
Revision: 325
http://christine.svn.sourceforge.net/christine/?rev=325&view=rev
Author: thesystems
Date: 2007-04-06 11:40:12 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
Support for internet radio stations that use the m3u file format
Modified Paths:
--------------
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-05 15:41:14 UTC (rev 324)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-06 18:40:12 UTC (rev 325)
@@ -1830,16 +1830,28 @@
if (response == gtk.RESPONSE_OK):
location = entry.get_text()
- if location.split(".").pop() == "pls":
+ extension = location.split(".").pop()
+ if extension in ["pls", "m3u"]:
import urllib
gate = urllib.FancyURLopener()
urldesc = gate.open(location)
+ if extension == "pls":
for i in urldesc.readlines():
if i.lower().find("file") > -1:
location = i.split("=").pop()
- print location
- self.setLocation(location)
- break
+ elif extension == "m3u":
+ lines = urldesc.readlines()
+ if lines[0].lower() != "#extm3u":
+ self.goNext()
+ sites = [k for k in lines if k[0:4] == "http"]
+ tl,name = ":".join(lines[1].split(":")[1:]).split(",")
+ print tl, name
+ self.__Display.setSong(name)
+ print sites
+ if len(sites) > 0:
+ location = sites[0].strip("\r").strip("\n").strip()
+ #gate = urllib.FancyURLopener()
+ #urldesc = gate.open(site)
self.setLocation(location)
self.__PlayButton.set_active(False)
self.__PlayButton.set_active(True)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-05 15:41:15
|
Revision: 324
http://christine.svn.sourceforge.net/christine/?rev=324&view=rev
Author: thesystems
Date: 2007-04-05 08:41:14 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
Fixed a small bug in the openRemote method where it doesn't push the play button to play
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-05 15:34:35 UTC (rev 323)
+++ trunk/christine/ChangeLog 2007-04-05 15:41:14 UTC (rev 324)
@@ -1,6 +1,8 @@
2007-04-05 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Christine.py.in:
- Support for somafm (and all .pls radio stations)
+ - Support for somafm (and all .pls radio stations)
+ - Fixed a bug where the openRemote method don't push
+ the play button to play.
2007-04-04 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Makefile.am:
Added the -fPIC to the gcc command in order to compile in
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-05 15:34:35 UTC (rev 323)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-05 15:41:14 UTC (rev 324)
@@ -1841,7 +1841,8 @@
self.setLocation(location)
break
self.setLocation(location)
- self.play()
+ self.__PlayButton.set_active(False)
+ self.__PlayButton.set_active(True)
dialog.destroy()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-05 15:34:37
|
Revision: 323
http://christine.svn.sourceforge.net/christine/?rev=323&view=rev
Author: thesystems
Date: 2007-04-05 08:34:35 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
support for somafm type of radio stations (.pls)
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
trunk/christine/po/Makefile
trunk/christine/po/Makefile.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-05 00:34:33 UTC (rev 322)
+++ trunk/christine/ChangeLog 2007-04-05 15:34:35 UTC (rev 323)
@@ -1,3 +1,6 @@
+2007-04-05 Marco Antonio Islas Cruz <ma...@is...>
+ * libchristine/Christine.py.in:
+ Support for somafm (and all .pls radio stations)
2007-04-04 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Makefile.am:
Added the -fPIC to the gcc command in order to compile in
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-05 00:34:33 UTC (rev 322)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-05 15:34:35 UTC (rev 323)
@@ -1829,7 +1829,18 @@
response = dialog.run()
if (response == gtk.RESPONSE_OK):
- self.setLocation(entry.get_text())
+ location = entry.get_text()
+ if location.split(".").pop() == "pls":
+ import urllib
+ gate = urllib.FancyURLopener()
+ urldesc = gate.open(location)
+ for i in urldesc.readlines():
+ if i.lower().find("file") > -1:
+ location = i.split("=").pop()
+ print location
+ self.setLocation(location)
+ break
+ self.setLocation(location)
self.play()
dialog.destroy()
Modified: trunk/christine/po/Makefile
===================================================================
--- trunk/christine/po/Makefile 2007-04-05 00:34:33 UTC (rev 322)
+++ trunk/christine/po/Makefile 2007-04-05 15:34:35 UTC (rev 323)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
Modified: trunk/christine/po/Makefile.in
===================================================================
--- trunk/christine/po/Makefile.in 2007-04-05 00:34:33 UTC (rev 322)
+++ trunk/christine/po/Makefile.in 2007-04-05 15:34:35 UTC (rev 323)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-05 00:35:10
|
Revision: 322
http://christine.svn.sourceforge.net/christine/?rev=322&view=rev
Author: thesystems
Date: 2007-04-04 17:34:33 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Fixed bug #1694684 where Core Window is resizable in small view mode
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-05 00:17:30 UTC (rev 321)
+++ trunk/christine/ChangeLog 2007-04-05 00:34:33 UTC (rev 322)
@@ -4,6 +4,8 @@
64 bits systems.
Fixed a bug where libchristine/Validator.py wheren't
installed
+ * libchristine/Christine.py.in:
+ Fixed bug #1694684 where Core Window is resizable in small view mode
2007-03-29 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Chrinstine.py.in:
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-04-05 00:17:30 UTC (rev 321)
+++ trunk/christine/libchristine/Christine.py.in 2007-04-05 00:34:33 UTC (rev 322)
@@ -570,6 +570,7 @@
self.__WindowSize = self.__Window.get_size()
self.__Window.unmaximize()
self.__Window.resize(10, 10)
+ self.__Window.set_resizable(False)
else:
try:
(w, h) = self.__WindowSize
@@ -579,6 +580,7 @@
self.__HPanedListsBox.show()
self.HBoxSearch.show()
self.__Window.resize(w, h)
+ self.__Window.set_resizable(True)
#
# This show/hide the visualization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-05 00:17:33
|
Revision: 321
http://christine.svn.sourceforge.net/christine/?rev=321&view=rev
Author: thesystems
Date: 2007-04-04 17:17:30 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Fixed a bug where libchristine/Validator.py where not installed
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/aclocal.m4
trunk/christine/libchristine/Makefile.am
trunk/christine/po/Makefile
trunk/christine/po/Makefile.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-04-04 23:56:35 UTC (rev 320)
+++ trunk/christine/ChangeLog 2007-04-05 00:17:30 UTC (rev 321)
@@ -2,6 +2,8 @@
* libchristine/Makefile.am:
Added the -fPIC to the gcc command in order to compile in
64 bits systems.
+ Fixed a bug where libchristine/Validator.py wheren't
+ installed
2007-03-29 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Chrinstine.py.in:
Modified: trunk/christine/aclocal.m4
===================================================================
--- trunk/christine/aclocal.m4 2007-04-04 23:56:35 UTC (rev 320)
+++ trunk/christine/aclocal.m4 2007-04-05 00:17:30 UTC (rev 321)
@@ -114,7 +114,8 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -389,8 +390,10 @@
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"`
else
@@ -398,6 +401,7 @@
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])
@@ -594,7 +598,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1978,6 +1982,18 @@
dynamic_linker=no
;;
+kfreebsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='GNU ld.so'
+ ;;
+
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2133,7 +2149,7 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2162,7 +2178,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
+knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2171,7 +2187,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
+ dynamic_linker='GNU ld.so'
;;
netbsd*)
@@ -2879,7 +2895,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | dragonfly*)
+freebsd* | kfreebsd*-gnu | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2933,11 +2949,11 @@
;;
# This must be Linux ELF.
-linux* | k*bsd*-gnu)
+linux*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3685,7 +3701,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3844,7 +3860,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3946,7 +3962,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -5211,7 +5227,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux* | k*bsd*-gnu)
+linux*)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5484,7 +5500,7 @@
;;
esac
;;
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5527,7 +5543,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5570,7 +5586,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5781,7 +5797,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux* | k*bsd*-gnu)
+ linux*)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5922,9 +5938,6 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6095,7 +6108,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux* | k*bsd*-gnu)
+ linux*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -6121,13 +6134,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6457,7 +6469,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6559,7 +6571,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6994,7 +7006,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
+ _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -7030,30 +7042,14 @@
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
- fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -7075,30 +7071,19 @@
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
if test $pkg_failed = yes; then
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
- fi
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
+[Package requirements ($2) were not met.
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -7106,7 +7091,9 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-_PKG_TEXT
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config. See the pkg-config man page for
+more details.
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
Modified: trunk/christine/libchristine/Makefile.am
===================================================================
--- trunk/christine/libchristine/Makefile.am 2007-04-04 23:56:35 UTC (rev 320)
+++ trunk/christine/libchristine/Makefile.am 2007-04-05 00:17:30 UTC (rev 321)
@@ -16,6 +16,7 @@
Christine.py \
Share.py \
Queue.py \
+Validator.py \
clibrary.so
DISTFILES= Makefile.in \
@@ -24,7 +25,7 @@
Translator.py.in \
libs_christine.py.in \
clibrary.c \
- plugins.py.in \
+ Plugins.py.in \
Christine.py.in \
Share.py.in \
$(scripts_DATA)
Modified: trunk/christine/po/Makefile
===================================================================
--- trunk/christine/po/Makefile 2007-04-04 23:56:35 UTC (rev 320)
+++ trunk/christine/po/Makefile 2007-04-05 00:17:30 UTC (rev 321)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr
+prefix = /usr/local
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
@@ -36,12 +36,12 @@
DATADIRNAME = share
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
-install_sh = /home/nibblesmx/christine/trunk/christine/install-sh
+install_sh = /home/markuz/programacion/python/christine/christine/install-sh
# Automake >= 1.8 provides mkdir -p --.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
-INSTALL = /usr/bin/install -c
+INSTALL = /usr/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
GMSGFMT = /usr/bin/msgfmt
Modified: trunk/christine/po/Makefile.in
===================================================================
--- trunk/christine/po/Makefile.in 2007-04-04 23:56:35 UTC (rev 320)
+++ trunk/christine/po/Makefile.in 2007-04-05 00:17:30 UTC (rev 321)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr
+prefix = /usr/local
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
@@ -36,12 +36,12 @@
DATADIRNAME = share
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
-install_sh = /home/nibblesmx/christine/trunk/christine/install-sh
+install_sh = /home/markuz/programacion/python/christine/christine/install-sh
# Automake >= 1.8 provides mkdir -p --.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
-INSTALL = /usr/bin/install -c
+INSTALL = /usr/bin/ginstall -c
INSTALL_DATA = ${INSTALL} -m 644
GMSGFMT = /usr/bin/msgfmt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-04-04 23:56:36
|
Revision: 320
http://christine.svn.sourceforge.net/christine/?rev=320&view=rev
Author: thesystems
Date: 2007-04-04 16:56:35 -0700 (Wed, 04 Apr 2007)
Log Message:
-----------
Added the -fPIC to the gcc command in order to compile in 64 bits systems
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Makefile.am
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-03-30 22:32:07 UTC (rev 319)
+++ trunk/christine/ChangeLog 2007-04-04 23:56:35 UTC (rev 320)
@@ -1,3 +1,8 @@
+2007-04-04 Marco Antonio Islas Cruz <ma...@is...>
+ * libchristine/Makefile.am:
+ Added the -fPIC to the gcc command in order to compile in
+ 64 bits systems.
+
2007-03-29 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Chrinstine.py.in:
Fixed a bug when trying to get the Small View mode.
Modified: trunk/christine/libchristine/Makefile.am
===================================================================
--- trunk/christine/libchristine/Makefile.am 2007-03-30 22:32:07 UTC (rev 319)
+++ trunk/christine/libchristine/Makefile.am 2007-04-04 23:56:35 UTC (rev 320)
@@ -61,7 +61,7 @@
$(edit) $(srcdir)/libs_christine.py.in > libs_christine.py
clibrary.so: Makefile $(srcdir)/clibrary.c
- gcc -Wall ${CFLAGS} -I${pythonincludedir} -I${usr_libdir} -c -o clibrary.o clibrary.c
+ gcc -Wall -fPIC ${CFLAGS} -I${pythonincludedir} -I${usr_libdir} -c -o clibrary.o clibrary.c
gcc -shared clibrary.o -o clibrary.so -L${pythonincludedir}
Christine.py: Makefile $(srcdir)/Christine.py.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nib...@us...> - 2007-03-30 22:32:09
|
Revision: 319
http://christine.svn.sourceforge.net/christine/?rev=319&view=rev
Author: nibblesmx
Date: 2007-03-30 15:32:07 -0700 (Fri, 30 Mar 2007)
Log Message:
-----------
the Queue module was declared as private, and needed to be public
accesible from the C launcher. Is working now
Modified Paths:
--------------
trunk/christine/christine.c
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/christine.c
===================================================================
--- trunk/christine/christine.c 2007-03-30 04:03:35 UTC (rev 318)
+++ trunk/christine/christine.c 2007-03-30 22:32:07 UTC (rev 319)
@@ -24,7 +24,7 @@
if len(sys.argv) > 1 and not \"--devel\" in sys.argv:\n\
for i in sys.argv[1:]:\n\
if os.path.isfile(i):\n\
- a.queue.add(i,prepend=True)\n\
+ a.Queue.add(i,prepend=True)\n\
a.play()\n\
a.runGtk()\n\
";
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-30 04:03:35 UTC (rev 318)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-30 22:32:07 UTC (rev 319)
@@ -195,13 +195,13 @@
self.__ScrolledMusic.add(self.__Library.tv)
#self.__VBoxCore.show_all()
- self.__Queue = queue()
+ self.Queue = queue()
self.__ScrolledQueue = self.__XML['ScrolledQueue']
- self.__Queue.treeview.connect('key-press-event', self.__queueHandlerKey)
- self.__Queue.treeview.connect('row-activated', self.itemActivated)
+ self.Queue.treeview.connect('key-press-event', self.QueueHandlerKey)
+ self.Queue.treeview.connect('row-activated', self.itemActivated)
- self.__ScrolledQueue.add(self.__Queue.treeview)
+ self.__ScrolledQueue.add(self.Queue.treeview)
gobject.timeout_add(500, self.checkQueue)
self.__ControlButton = self.__XML['control_button']
@@ -323,18 +323,18 @@
# @param widget widget The widget that will be used
# @param event event The event requested by the widget
# @return void
- def __queueHandlerKey(self, widget, event):
+ def QueueHandlerKey(self, widget, event):
"""
Handler the key-press-event in the queue list
"""
if (event.keyval == 65535):
- selection = self.__Queue.treeview.get_selection()
+ selection = self.Queue.treeview.get_selection()
(model, iter) = selection.get_selected()
if (iter is not None):
name = model.get_value(iter, NAME)
- self.__Queue.remove(iter)
- self.__Queue.save()
+ self.Queue.remove(iter)
+ self.Queue.save()
#
# Catch popupMenu events
@@ -386,7 +386,7 @@
(model, iter,) = selection.get_selected()
file = model.get_value(iter, PATH)
- self.__Queue.add(file)
+ self.Queue.add(file)
#
# Handle the key-press-event in the library.
@@ -413,7 +413,7 @@
(model, iter) = selection.get_selected()
name = model.get_value(iter, PATH)
- self.__Queue.add(name)
+ self.Queue.add(name)
#
# Remove file from library
@@ -973,15 +973,15 @@
# Look for a file in the queue. Iter should not be None in the case
# there where something in the queue
- model = self.__Queue.treeview.get_model()
+ model = self.Queue.treeview.get_model()
iter = model.get_iter_first()
if (type(iter) == gtk.TreeIter):
self.setLocation(model.get_value(iter, PATH))
self.__LibraryCurrentInter == None
self.jumpToPlaying()
- self.__Queue.remove(iter)
- self.__Queue.save()
+ self.Queue.remove(iter)
+ self.Queue.save()
self.__PlayButton.set_active(False)
self.__PlayButton.set_active(True)
else:
@@ -1012,7 +1012,7 @@
# @param widget
# @return boolean
def checkQueue(self):
- model = self.__Queue.treeview.get_model()
+ model = self.Queue.treeview.get_model()
if (model != None):
b = model.get_iter_first()
@@ -1304,7 +1304,7 @@
# What I told, if queue is true
# send it to queue
if (queue):
- self.__Queue.save()
+ self.Queue.save()
else:
self.__Library.save()
@@ -1473,7 +1473,7 @@
print 'library.save()'
self.__Library.save()
else:
- self.__Queue.add(new_file)
+ self.Queue.add(new_file)
length = len(self.__FilesToAdd)
@@ -1545,7 +1545,7 @@
self.__addFile(queue=queue)
self.__Library.connect('tags-found', self.__addFile)
- self.__Queue.connect('tags-found', self.__addFile,True)
+ self.Queue.connect('tags-found', self.__addFile,True)
self.__AddWindow.run()
self.__AddWindow.destroy()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-30 04:03:39
|
Revision: 318
http://christine.svn.sourceforge.net/christine/?rev=318&view=rev
Author: thesystems
Date: 2007-03-29 21:03:35 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Fixed an infinite import because the tags-found Library signal, and first attempt to fix the bug in the import Folder, where it doesn't filter the files to import
Modified Paths:
--------------
trunk/christine/libchristine/Christine.py.in
trunk/christine/libchristine/Library.py
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-30 03:36:50 UTC (rev 317)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-30 04:03:35 UTC (rev 318)
@@ -1360,15 +1360,23 @@
"""
files = os.listdir(dir)
f = []
+ self.f = []
for i in files:
ext = i.split('.').pop()
+ exists = False
+
+ if (os.path.join(i[0], path) in self.f):
+ exists = True
+
# Again, only files with the right
# extension will be imported
- if (ext in [sound, video]):
+ print ext
+ if (ext in self.__GConf.getString('backend/allowed_files').split(',')):
f.append(i)
files = f
+ print files
self.addFiles(files)
#
@@ -1401,7 +1409,7 @@
# create a temporal list with the path of
# the files already stored in the library
# to avoid duplicates
- #self.__LibraryModel.foreach(lambda model,path,iter: self.f.append(model.get_value(iter,PATH)))
+ self.__LibraryModel.foreach(lambda model,path,iter: self.f.append(model.get_value(iter,PATH)))
for i in filenames:
for path in i[1]:
ext = path.split('.').pop().lower()
@@ -1416,12 +1424,14 @@
# libs_christine/libs_christine.py
# We need to know what files are supported by
# gstreamer
+ print ext
if ext in self.__GConf.getString('backend/allowed_files').split(',') and not exists:
f.append(os.path.join(i[0],path))
#else:
# print "skipping:",os.path.join(i[0],path)
# Once we have the files to add, then use the addFiles
# wrapper method to add them.
+ print f
if (len(f) > 0):
self.addFiles(files = f)
else:
@@ -1522,7 +1532,10 @@
self.__LibraryNaturalModel.foreach(self.getPaths)
for i in files:
- if (not i in self.__Paths):
+ ext = i.split('.').pop().lower()
+ if (not i in self.__Paths) and \
+ (ext in self.__GConf.getString('backend/allowed_files').split(',')):
+ print i,ext
self.__FilesToAdd.append(i)
else:
print 'skipping: ', i
Modified: trunk/christine/libchristine/Library.py
===================================================================
--- trunk/christine/libchristine/Library.py 2007-03-30 03:36:50 UTC (rev 317)
+++ trunk/christine/libchristine/Library.py 2007-03-30 04:03:35 UTC (rev 318)
@@ -300,7 +300,7 @@
PLAY_COUNT,0,
GENRE,genre)
- #print "tags found",d.tags
+ gobject.timeout_add(150,self.emit_signal,"tags-found")
if t == gst.MESSAGE_ERROR:
print b.parse_error()
return True
@@ -320,7 +320,6 @@
text = "%02d:%02d"%divmod(ts,60)
self.model.set(self.iters[d.getLocation()],
TIME,text)
- gobject.timeout_add(150,self.emit_signal,"tags-found")
except gst.QueryError:
#d.setLocation(d.getLocation())
pass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nib...@us...> - 2007-03-30 03:36:52
|
Revision: 317
http://christine.svn.sourceforge.net/christine/?rev=317&view=rev
Author: nibblesmx
Date: 2007-03-29 20:36:50 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Library.py most obnoxious errors are corrected
Modified Paths:
--------------
trunk/christine/libchristine/Library.py
trunk/christine/po/Makefile
trunk/christine/po/Makefile.in
Modified: trunk/christine/libchristine/Library.py
===================================================================
--- trunk/christine/libchristine/Library.py 2007-03-30 03:23:25 UTC (rev 316)
+++ trunk/christine/libchristine/Library.py 2007-03-30 03:36:50 UTC (rev 317)
@@ -274,17 +274,17 @@
name = self.model.get_value(iter,NAME)
if name == os.path.split(d.getLocation()[1]):
return True
- d.found_tags_cb(b.parse_tag())
- name = d.get_tag("title")
- album = d.get_tag("album")
- artist = d.get_tag("artist")
- tn = d.get_tag("track-number")
- genre = d.get_tag("genre")
+ d.callbackFoundTags(b.parse_tag())
+ name = d.getTag("title")
+ album = d.getTag("album")
+ artist = d.getTag("artist")
+ tn = d.getTag("track-number")
+ genre = d.getTag("genre")
if name == "":
n = os.path.split(d.getLocation())[1].split(".")
name = ".".join([k for k in n[:-1]])
model = self.model
- if d.get_tag("video-codec") != "" or \
+ if d.getTag("video-codec") != "" or \
os.path.splitext(d.getLocation())[1] in CHRISTINE_VIDEO_EXT:
t = "video"
else:
Modified: trunk/christine/po/Makefile
===================================================================
--- trunk/christine/po/Makefile 2007-03-30 03:23:25 UTC (rev 316)
+++ trunk/christine/po/Makefile 2007-03-30 03:36:50 UTC (rev 317)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
Modified: trunk/christine/po/Makefile.in
===================================================================
--- trunk/christine/po/Makefile.in 2007-03-30 03:23:25 UTC (rev 316)
+++ trunk/christine/po/Makefile.in 2007-03-30 03:36:50 UTC (rev 317)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nib...@us...> - 2007-03-30 03:24:11
|
Revision: 316
http://christine.svn.sourceforge.net/christine/?rev=316&view=rev
Author: nibblesmx
Date: 2007-03-29 20:23:25 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
a lot of bug fixed due to the code clean up
Modified Paths:
--------------
trunk/christine/libchristine/Christine.py.in
trunk/christine/libchristine/Library.py
trunk/christine/po/Makefile
trunk/christine/po/Makefile.in
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-30 02:40:00 UTC (rev 315)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-30 03:23:25 UTC (rev 316)
@@ -1314,7 +1314,7 @@
# @access public
# @param widget
# @return void
- def import_folder(self, widget):
+ def importFolder(self, widget):
"""
This is the 'simple' way to import folders
Creates and rund a filechooser dialog to
Modified: trunk/christine/libchristine/Library.py
===================================================================
--- trunk/christine/libchristine/Library.py 2007-03-30 02:40:00 UTC (rev 315)
+++ trunk/christine/libchristine/Library.py 2007-03-30 03:23:25 UTC (rev 316)
@@ -87,12 +87,12 @@
# try:
# self.CURRENT_ITER = self.model.iter_next(self.CURRENT_ITER)
# path = self.model.get(self.CURRENT_ITER,PATH)
- # self.discoverer.set_location(path)
- # self.iters[self.discoverer.get_location()] = self.CURRENT_ITER
+ # self.discoverer.setLocation(path)
+ # self.iters[self.discoverer.getLocation()] = self.CURRENT_ITER
# print locals()
# except:
# self.CURRENT_ITER = self.model.get_iter_first()
- # print self.discoverer.get_location()
+ # print self.discoverer.getLocation()
# return True
def gen_model(self,refresh=False):
@@ -234,9 +234,9 @@
def add(self,file,prepend=False,n=1):
#if n == 1:
- self.discoverer.set_location(file)
+ self.discoverer.setLocation(file)
#else:
- # self.discoverer2.set_location(file)
+ # self.discoverer2.setLocation(file)
if type(file) == type(()):
file = file[0]
if not os.path.isfile(file):
@@ -264,15 +264,15 @@
self.emit("tags-found",self)
def message_handler(self,bus,b):
- if bus == self.discoverer.bus:
+ if bus == self.discoverer.Bus:
d = self.discoverer
else:
d = self.discoverer2
t = b.type
if t == gst.MESSAGE_TAG:
- iter = self.iters[d.get_location()]
- name = self.model.getValue(iter,NAME)
- if name == os.path.split(d.get_location()[1]):
+ iter = self.iters[d.getLocation()]
+ name = self.model.get_value(iter,NAME)
+ if name == os.path.split(d.getLocation()[1]):
return True
d.found_tags_cb(b.parse_tag())
name = d.get_tag("title")
@@ -281,16 +281,16 @@
tn = d.get_tag("track-number")
genre = d.get_tag("genre")
if name == "":
- n = os.path.split(d.get_location())[1].split(".")
+ n = os.path.split(d.getLocation())[1].split(".")
name = ".".join([k for k in n[:-1]])
model = self.model
if d.get_tag("video-codec") != "" or \
- os.path.splitext(d.get_location())[1] in CHRISTINE_VIDEO_EXT:
+ os.path.splitext(d.getLocation())[1] in CHRISTINE_VIDEO_EXT:
t = "video"
else:
t = "audio"
- model.set(self.iters[d.get_location()],
+ model.set(self.iters[d.getLocation()],
NAME,name,
TYPE,t,
ALBUM,album,
@@ -318,11 +318,11 @@
total = d.query_duration(gst.FORMAT_TIME)[0]
ts = total/gst.SECOND
text = "%02d:%02d"%divmod(ts,60)
- self.model.set(self.iters[d.get_location()],
+ self.model.set(self.iters[d.getLocation()],
TIME,text)
gobject.timeout_add(150,self.emit_signal,"tags-found")
except gst.QueryError:
- #d.set_location(d.get_location())
+ #d.setLocation(d.getLocation())
pass
return True
@@ -331,7 +331,7 @@
'''
Remove the selected iter from the library.
'''
- key = self.model.getValue(iter,PATH)
+ key = self.model.get_value(iter,PATH)
self.library_lib.remove(key)
self.model.remove(iter)
Modified: trunk/christine/po/Makefile
===================================================================
--- trunk/christine/po/Makefile 2007-03-30 02:40:00 UTC (rev 315)
+++ trunk/christine/po/Makefile 2007-03-30 03:23:25 UTC (rev 316)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr
+prefix = /usr/local
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
Modified: trunk/christine/po/Makefile.in
===================================================================
--- trunk/christine/po/Makefile.in 2007-03-30 02:40:00 UTC (rev 315)
+++ trunk/christine/po/Makefile.in 2007-03-30 03:23:25 UTC (rev 316)
@@ -28,7 +28,7 @@
top_builddir = ..
-prefix = /usr
+prefix = /usr/local
exec_prefix = ${prefix}
datadir = ${datarootdir}
datarootdir = ${prefix}/share
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nib...@us...> - 2007-03-30 02:40:02
|
Revision: 315
http://christine.svn.sourceforge.net/christine/?rev=315&view=rev
Author: nibblesmx
Date: 2007-03-29 19:40:00 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
/usr/share/themes/MurrinaGraphite/gtk-2.0/gtkrc:55: Murrine configuration option "squaredstyle" is not supported and will be ignored.
corrected the hidden/unhidden trayIcon thing
Modified Paths:
--------------
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-29 20:31:22 UTC (rev 314)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-30 02:40:00 UTC (rev 315)
@@ -309,12 +309,12 @@
intended when you want to show the window
in your current workspace
"""
- if (self.IsHidden == True):
+ if (self.__IsHidden == True):
self.__Window.show()
else:
self.__Window.hide()
- self.IsHidden = not self.IsHidden
+ self.__IsHidden = not self.__IsHidden
#
# Queue list key-press-event manager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-29 20:31:24
|
Revision: 314
http://christine.svn.sourceforge.net/christine/?rev=314&view=rev
Author: thesystems
Date: 2007-03-29 13:31:22 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Fixed a bug in tray icon, where tray icon wasn't showing up
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-03-29 19:52:28 UTC (rev 313)
+++ trunk/christine/ChangeLog 2007-03-29 20:31:22 UTC (rev 314)
@@ -2,6 +2,7 @@
* libchristine/Chrinstine.py.in:
Fixed a bug when trying to get the Small View mode.
Ctrl+F wasn't focusing the Search box. Fixed.
+ Fixed a try icon Bug, it wasn't showing up
* cplugins/show_properties.py:
Fixed some bugs with the Discoverer module
2007-03-24 Marco Antonio Islas Cruz <ma...@is...>
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-29 19:52:28 UTC (rev 313)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-29 20:31:22 UTC (rev 314)
@@ -73,7 +73,7 @@
GtkMisc.__init__(self)
self.__Share = Share()
- print 'SHARE IDENTIFY: ', self.__Share.getId()
+ #print 'SHARE IDENTIFY: ', self.__Share.getId()
self.__GConf = ChristineGConf()
self.__XML = self.__Share.getTemplate('WindowCore')
@@ -270,10 +270,9 @@
Show the TrayIcon
"""
self.__TrayIcon = gtk.StatusIcon()
- self.__TrayIcon.set_from_file(os.path.join(SHARE_PATH,'gui','pixmap','trayicon.png'))
+ self.__TrayIcon.set_from_pixbuf(self.__Share.getImageFromPix('trayicon'))
self.__TrayIcon.connect('popup-menu', self.__trayIconHandlerEvent)
self.__TrayIcon.connect('activate', self.__trayIconActivated)
-
self.__TrayIcon.set_visible(self.__GConf.getBool('ui/show_in_notification_area'))
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nib...@us...> - 2007-03-29 19:52:33
|
Revision: 313
http://christine.svn.sourceforge.net/christine/?rev=313&view=rev
Author: nibblesmx
Date: 2007-03-29 12:52:28 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
/usr/share/themes/MurrinaGraphite/gtk-2.0/gtkrc:55: Murrine configuration option "squaredstyle" is not supported and will be ignored.
changed the extra line in AUTHORS
Modified Paths:
--------------
trunk/christine/aclocal.m4
trunk/christine/po/Makefile
trunk/christine/po/Makefile.in
Modified: trunk/christine/aclocal.m4
===================================================================
--- trunk/christine/aclocal.m4 2007-03-29 19:49:40 UTC (rev 312)
+++ trunk/christine/aclocal.m4 2007-03-29 19:52:28 UTC (rev 313)
@@ -114,8 +114,7 @@
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- USE_NLS=yes
+ [USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -390,10 +389,8 @@
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"`
else
@@ -401,7 +398,6 @@
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])
@@ -598,7 +594,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1982,18 +1978,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -2149,7 +2133,7 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2178,7 +2162,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
+netbsdelf*-gnu)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2187,7 +2171,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
+ dynamic_linker='NetBSD ld.elf_so'
;;
netbsd*)
@@ -2895,7 +2879,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu | dragonfly*)
+freebsd* | dragonfly*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -2949,11 +2933,11 @@
;;
# This must be Linux ELF.
-linux*)
+linux* | k*bsd*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3701,7 +3685,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3860,7 +3844,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -3962,7 +3946,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -5227,7 +5211,7 @@
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
;;
-linux*)
+linux* | k*bsd*-gnu)
if test "$host_cpu" = ia64; then
symcode='[[ABCDGIRSTW]]'
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
@@ -5500,7 +5484,7 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5543,7 +5527,7 @@
;;
esac
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -5586,7 +5570,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5797,7 +5781,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
- linux*)
+ linux* | k*bsd*-gnu)
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -5938,6 +5922,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -6108,7 +6095,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
- linux*)
+ linux* | k*bsd*-gnu)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
@@ -6134,12 +6121,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6469,7 +6457,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu | dragonfly*)
+ freebsd* | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6571,7 +6559,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -7006,7 +6994,7 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+ _pkg_min_version=m4_default([$1], [0.9.0])
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
AC_MSG_RESULT([yes])
@@ -7042,14 +7030,30 @@
# ---------------------------------------------
m4_define([_PKG_CONFIG],
[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
PKG_CHECK_EXISTS([$3],
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
[pkg_failed=yes])
+ fi
else
pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
# [ACTION-IF-NOT-FOUND])
#
@@ -7071,19 +7075,30 @@
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
if test $pkg_failed = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
# Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.])],
+_PKG_TEXT
+])],
[$4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
@@ -7091,9 +7106,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config. See the pkg-config man page for
-more details.
+_PKG_TEXT
To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
[$4])
Modified: trunk/christine/po/Makefile
===================================================================
--- trunk/christine/po/Makefile 2007-03-29 19:49:40 UTC (rev 312)
+++ trunk/christine/po/Makefile 2007-03-29 19:52:28 UTC (rev 313)
@@ -36,12 +36,12 @@
DATADIRNAME = share
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
-install_sh = /home/markuz/programacion/python/christine/christine/install-sh
+install_sh = /home/nibblesmx/christine/trunk/christine/install-sh
# Automake >= 1.8 provides mkdir -p --.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
-INSTALL = /usr/bin/ginstall -c
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
GMSGFMT = /usr/bin/msgfmt
Modified: trunk/christine/po/Makefile.in
===================================================================
--- trunk/christine/po/Makefile.in 2007-03-29 19:49:40 UTC (rev 312)
+++ trunk/christine/po/Makefile.in 2007-03-29 19:52:28 UTC (rev 313)
@@ -36,12 +36,12 @@
DATADIRNAME = share
itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
-install_sh = /home/markuz/programacion/python/christine/christine/install-sh
+install_sh = /home/nibblesmx/christine/trunk/christine/install-sh
# Automake >= 1.8 provides mkdir -p --.
# Until it can be supposed, use the safe fallback:
mkdir_p = $(install_sh) -d
-INSTALL = /usr/bin/ginstall -c
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
GMSGFMT = /usr/bin/msgfmt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-29 19:49:46
|
Revision: 312
http://christine.svn.sourceforge.net/christine/?rev=312&view=rev
Author: thesystems
Date: 2007-03-29 12:49:40 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Check the changelog for 2007-03-29
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/cplugins/show_properties.py
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-03-29 15:47:52 UTC (rev 311)
+++ trunk/christine/ChangeLog 2007-03-29 19:49:40 UTC (rev 312)
@@ -1,6 +1,9 @@
2007-03-29 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Chrinstine.py.in:
Fixed a bug when trying to get the Small View mode.
+ Ctrl+F wasn't focusing the Search box. Fixed.
+ * cplugins/show_properties.py:
+ Fixed some bugs with the Discoverer module
2007-03-24 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Display.py:
Fixed a small bug in the main rectangle draw.
Modified: trunk/christine/cplugins/show_properties.py
===================================================================
--- trunk/christine/cplugins/show_properties.py 2007-03-29 15:47:52 UTC (rev 311)
+++ trunk/christine/cplugins/show_properties.py 2007-03-29 19:49:40 UTC (rev 312)
@@ -18,17 +18,17 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-from lib_christine.discoverer import *
-from lib_christine.gtk_misc import *
-from lib_christine.library import *
-from lib_christine.trans import *
+from lib_christine.Discoverer import *
+from lib_christine.GtkMisc import *
+from lib_christine.Library import *
+from lib_christine.Translator import *
-class Handler(gtk_misc):
+class Handler(GtkMisc):
def __init__(self,interface):
self.interface = interface
- self.discoverer = discoverer()
- self.discoverer.bus.add_watch(self.message_handler)
- gtk_misc.__init__(self)
+ self.__discoverer = Discoverer()
+ self.di.bus.add_watch(self.message_handler)
+ GtkMisc.__init__(self)
self.gconf = christine_gconf()
active = self.gconf.gconf.key_is_writable("/apps/christine/plugins/show_properties")
if active == None:
@@ -46,6 +46,7 @@
menuitem.show_all()
menuitem.connect("activate",self.show)
#self.interface.register_on_menu("edit",menuitem)
+ print menuitem
self.interface.menus["edit"].append(menuitem)
def start(self):
@@ -55,7 +56,7 @@
selection = self.interface.library_treeview.get_selection()
model,iter = selection.get_selected()
file = model.get_value(iter,PATH)
- self.discoverer.set_location(file)
+ self.__discoverer.set_location(file)
xml = glade_xml("properties.glade")
self.dialog = xml["dialog"]
self.file = xml["file"]
@@ -75,25 +76,25 @@
def message_handler(self,a,b):
if b.type == gst.MESSAGE_TAG:
- self.discoverer.found_tags_cb(b.parse_tag())
+ self.__discoverer.found_tags_cb(b.parse_tag())
self.check_tags()
return True
def check_tags(self):
- date = self.discoverer.get_tag("date")
+ date = self.__discoverer.getTag("date")
if type(date) == gst.Date:
day = date.day
month = date.month
year = date.year
else:
day,month,year = (0,0,0)
- self.tn.set_text(str(self.discoverer.get_tag("track-number")))
- self.title.set_text(self.discoverer.get_tag("title"))
- self.album.set_text(self.discoverer.get_tag("album"))
- self.artist.set_text(self.discoverer.get_tag("artist"))
- self.genre.set_text(self.discoverer.get_tag("genre"))
+ self.tn.set_text(str(self.__discoverer.getTag("track-number")))
+ self.title.set_text(self.__discoverer.getTag("title"))
+ self.album.set_text(self.__discoverer.getTag("album"))
+ self.artist.set_text(self.__discoverer.getTag("artist"))
+ self.genre.set_text(self.__discoverer.getTag("genre"))
self.date.set_text("%d-%d-%d"%(year,month,day))
- self.acodec.set_text(self.discoverer.get_tag("audio-codec"))
- self.vcodec.set_text(self.discoverer.get_tag("video-codec"))
- self.mode.set_text(self.discoverer.get_tag("mode"))
- self.bitrate.set_text(str(self.discoverer.get_tag("bitrate")))
+ self.acodec.set_text(self.__discoverer.getTag("audio-codec"))
+ self.vcodec.set_text(self.__discoverer.getTag("video-codec"))
+ self.mode.set_text(self.__discoverer.getTag("mode"))
+ self.bitrate.set_text(str(self.__discoverer.getTag("bitrate")))
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-29 15:47:52 UTC (rev 311)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-29 19:49:40 UTC (rev 312)
@@ -497,7 +497,6 @@
self.__Library.save()
self.__LastPlayed.append(filename)
- print self.__LastPlayed
self.__GConf.setValue('backend/last_played', filename)
self.__Player.setLocation(filename)
@@ -710,7 +709,7 @@
# @access public
# @param widget
# @return void
- def onEntrySearchActivate(self, widget):
+ def onFindActivate(self, widget):
"""
Set the focus on the Search entry
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-29 15:47:54
|
Revision: 311
http://christine.svn.sourceforge.net/christine/?rev=311&view=rev
Author: thesystems
Date: 2007-03-29 08:47:52 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Fixed a bug that block when trying to get the small view mode
Modified Paths:
--------------
trunk/christine/ChangeLog
trunk/christine/libchristine/Christine.py.in
Modified: trunk/christine/ChangeLog
===================================================================
--- trunk/christine/ChangeLog 2007-03-27 15:07:12 UTC (rev 310)
+++ trunk/christine/ChangeLog 2007-03-29 15:47:52 UTC (rev 311)
@@ -1,3 +1,6 @@
+2007-03-29 Marco Antonio Islas Cruz <ma...@is...>
+ * libchristine/Chrinstine.py.in:
+ Fixed a bug when trying to get the Small View mode.
2007-03-24 Marco Antonio Islas Cruz <ma...@is...>
* libchristine/Display.py:
Fixed a small bug in the main rectangle draw.
Modified: trunk/christine/libchristine/Christine.py.in
===================================================================
--- trunk/christine/libchristine/Christine.py.in 2007-03-27 15:07:12 UTC (rev 310)
+++ trunk/christine/libchristine/Christine.py.in 2007-03-29 15:47:52 UTC (rev 311)
@@ -567,7 +567,7 @@
if (active):
self.__HPanedListsBox.hide()
- self.__HBoxSearch.hide()
+ self.HBoxSearch.hide()
self.__WindowSize = self.__Window.get_size()
self.__Window.unmaximize()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-27 15:07:16
|
Revision: 310
http://christine.svn.sourceforge.net/christine/?rev=310&view=rev
Author: thesystems
Date: 2007-03-27 08:07:12 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Some widgets need to be public for the plugins stuff
Modified Paths:
--------------
trunk/christine/libchristine/Christine.py.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-27 15:06:46
|
Revision: 309
http://christine.svn.sourceforge.net/christine/?rev=309&view=rev
Author: thesystems
Date: 2007-03-27 08:06:44 -0700 (Tue, 27 Mar 2007)
Log Message:
-----------
Fixed the path for cplugins
Modified Paths:
--------------
trunk/christine/libchristine/Plugins.py.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2007-03-27 04:06:10
|
Revision: 308
http://christine.svn.sourceforge.net/christine/?rev=308&view=rev
Author: thesystems
Date: 2007-03-26 21:06:08 -0700 (Mon, 26 Mar 2007)
Log Message:
-----------
Fixed the problem where make install didn't install the libchrstine/pattern module
Modified Paths:
--------------
trunk/christine/Makefile.am
trunk/christine/configure.ac
Added Paths:
-----------
trunk/christine/libchristine/pattern/Makefile.am
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|