Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21590
Modified Files:
Tag: coverart_display_development_branch
gtkpod.glade configure.in .cvsignore
Log Message:
08/01/2007
- Commit of 2nd prototype version of display_coverart
- Addition of a default image file if tracks do not contain cover art
- Modifications to existing api to allow integration with new code
- New src files added that contain functionality for cover art display
Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.217
retrieving revision 1.217.2.1
diff -u -d -r1.217 -r1.217.2.1
--- gtkpod.glade 22 Nov 2006 15:54:37 -0000 1.217
+++ gtkpod.glade 8 Jan 2007 21:08:44 -0000 1.217.2.1
@@ -1477,21 +1477,127 @@
<property name="position">150</property>
<child>
- <widget class="GtkScrolledWindow" id="playlist_window">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="homogeneous">True</property>
+ <property name="spacing">0</property>
<child>
- <placeholder/>
+ <widget class="GtkScrolledWindow" id="playlist_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="cover_display_window">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="cover_display_canvasbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="cover_display_controlbox">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkButton" id="cover_display_leftbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes"><</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHScale" id="cover_display_scaler">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="draw_value">False</property>
+ <property name="value_pos">GTK_POS_TOP</property>
+ <property name="digits">0</property>
+ <property
name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+ <property name="inverted">False</property>
+ <property name="adjustment">0 0 0 1 9 0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton"
id="cover_display_rightbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">></property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
</child>
</widget>
<packing>
<property name="shrink">True</property>
- <property name="resize">False</property>
+ <property name="resize">True</property>
</packing>
</child>
@@ -11829,6 +11935,27 @@
<property name="spacing">6</property>
<child>
+ <widget class="GtkCheckButton"
id="cfg_display_artcovers">
+ <property name="visible">True</property>
+ <property name="tooltip"
translatable="yes">Enable or disable the cover artwork display shown in the
window below the list of playlists</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Enable the cover art display window</property>
+ <property
name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property
name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property
name="inconsistent">False</property>
+ <property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_cfg_coverart_display_toggled" last_modification_time="Thu, 28 Dec
2006 17:03:18 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkCheckButton"
id="cfg_tmp_disable_sort">
<property name="visible">True</property>
<property name="tooltip"
translatable="yes">It is much faster to sort the display after all tracks have
been added. Some people might feel irritated by this behaviour and should
uncheck this option.</property>
Index: configure.in
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v
retrieving revision 1.95
retrieving revision 1.95.2.1
diff -u -d -r1.95 -r1.95.2.1
--- configure.in 28 Nov 2006 00:38:56 -0000 1.95
+++ configure.in 8 Jan 2007 21:08:44 -0000 1.95.2.1
@@ -37,7 +37,7 @@
fi
dnl check for libs that are managed with pkg-config
-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 >
2.4.0 libglade-2.0 >= 2.4.0 gmodule-2.0 libgpod-1.0 >=
0.4.0],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
+PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.6.0 gthread-2.0 >= 0.14.0 glib-2.0 >
2.4.0 libglade-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.14.0 gmodule-2.0
libgpod-1.0 >= 0.4.0],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- .cvsignore 7 May 2005 02:06:44 -0000 1.3
+++ .cvsignore 8 Jan 2007 21:08:44 -0000 1.3.4.1
@@ -10,3 +10,6 @@
mkinstalldirs
stamp-h.in
stamp-h1
+.project
+.cdtproject
+.settings
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
