Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1475

Modified Files:
        .cvsignore ChangeLog_detailed TODOandBUGS.txt configure.in 
        gtkpod.glade 
Log Message:
          Merged P.G. Richardson's album display branch back to the
          main trunk. Thanks for your work!



Index: .cvsignore
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore  7 May 2005 02:06:44 -0000       1.3
+++ .cvsignore  20 Feb 2007 14:11:21 -0000      1.4
@@ -10,3 +10,12 @@
 mkinstalldirs
 stamp-h.in
 stamp-h1
+.project
+.cdtproject
+.settings
+install-sh
+config.guess
+config.sub
+missing
+depcomp
+ylwrap

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -r1.385 -r1.386
--- ChangeLog_detailed  19 Feb 2007 14:23:28 -0000      1.385
+++ ChangeLog_detailed  20 Feb 2007 14:11:21 -0000      1.386
@@ -1,3 +1,19 @@
+2007-02-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * Modified Files:
+         .cvsignore TODOandBUGS.txt configure.in gtkpod.glade 
+         src/Makefile.am src/display.c src/display.h 
+         src/display_playlists.c src/display_private.h 
+         src/display_sorttabs.c src/display_tracks.c 
+         src/fileselection.c src/main.c src/misc_confirm.c src/prefs.c 
+         src/prefs_window.c 
+        * Added Files:
+         pixmaps/cdshine.png pixmaps/default-cover.png 
+         src/display_coverart.c src/display_coverart.h
+
+         Merged P.G. Richardson's album display branch back to the
+         main trunk. Thanks for your work!
+
 2007-02-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
         * src/display.c

Index: TODOandBUGS.txt
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/TODOandBUGS.txt,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- TODOandBUGS.txt     18 Feb 2007 03:05:53 -0000      1.87
+++ TODOandBUGS.txt     20 Feb 2007 14:11:21 -0000      1.88
@@ -12,6 +12,51 @@
 - save extended database when rehash was done, even if main database
   is not changed.
 
+CoverArt_display:
+- Remove the preference and add by default, complete with arrows to minimize 
the display if required.
+# Add a title to the display indicating the album displayed.
+# Selection of a track causes the display to switch to the relevant album cover
+# Selecting an album from either sort list causes switching display to 
relevant album cover
+# Update the covers when the alphabetize function is called
+- Improve animation?
+- Automatically retrieve album art through Amazon or Google
+# Clear images before setting them in case a null is returned from get_thumb()
+- On Delete of album / track / artist, call cover_set_images again
+- On add of album / track / artist, call cover_set_images again
+
+
+###
+
+CoverArt_display:
+- Remove the preference and add by default, complete with arrows to minimize 
the display if required.
+# Add a title to the display indicating the album displayed.
+# Selection of a track causes the display to switch to the relevant album cover
+# Selecting an album from either sort list causes switching display to 
relevant album cover
+# Update the covers when the alphabetize function is called
+- Improve animation?
+- Automatically retrieve album art through Amazon or Google
+# Clear images before setting them in case a null is returned from get_thumb()
+- On Delete of album / track / artist, call cover_set_images again
+- On add of album / track / artist, call cover_set_images again
+
+
+###
+
+CoverArt_display:
+- Remove the preference and add by default, complete with arrows to minimize 
the display if required.
+# Add a title to the display indicating the album displayed.
+# Selection of a track causes the display to switch to the relevant album cover
+# Selecting an album from either sort list causes switching display to 
relevant album cover
+# Update the covers when the alphabetize function is called
+- Improve animation?
+- Automatically retrieve album art through Amazon or Google
+# Clear images before setting them in case a null is returned from get_thumb()
+- On Delete of album / track / artist, call cover_set_images again
+- On add of album / track / artist, call cover_set_images again
+
+
+###
+
 - unload iPods when exiting gtkpod (ask/option).
 
 - cddb lookup (http://freedb.freedb.org). See also

Index: configure.in
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- configure.in        4 Feb 2007 12:43:48 -0000       1.97
+++ configure.in        20 Feb 2007 14:11:21 -0000      1.98
@@ -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.2],,[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.2],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -d -r1.223 -r1.224
--- gtkpod.glade        18 Feb 2007 03:19:56 -0000      1.223
+++ gtkpod.glade        20 Feb 2007 14:11:22 -0000      1.224
@@ -1475,22 +1475,206 @@
          <property name="visible">True</property>
          <property name="can_focus">True</property>
          <property name="position">150</property>
+         <signal name="button_release_event" 
handler="on_paned0_button_release_event" last_modification_time="Sat, 17 Feb 
2007 20:51:03 GMT"/>
 
          <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">False</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="GtkHBox" id="cover_visible_control_box">
+                 <property name="height_request">23</property>
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">0</property>
+
+                 <child>
+                   <widget class="GtkButton" id="cover_down_button">
+                     <property name="width_request">25</property>
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NONE</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" 
handler="on_cover_down_button_clicked" last_modification_time="Sat, 17 Feb 2007 
19:15:25 GMT"/>
+
+                     <child>
+                       <widget class="GtkArrow" id="arrow1">
+                         <property name="width_request">22</property>
+                         <property name="visible">True</property>
+                         <property name="arrow_type">GTK_ARROW_DOWN</property>
+                         <property 
name="shadow_type">GTK_SHADOW_NONE</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                     <property name="pack_type">GTK_PACK_END</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkButton" id="cover_up_button">
+                     <property name="width_request">25</property>
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NONE</property>
+                     <property name="focus_on_click">True</property>
+                     <signal name="clicked" 
handler="on_cover_up_button_clicked" last_modification_time="Sat, 17 Feb 2007 
19:37:56 GMT"/>
+
+                     <child>
+                       <widget class="GtkArrow" id="arrow2">
+                         <property name="visible">True</property>
+                         <property name="arrow_type">GTK_ARROW_UP</property>
+                         <property 
name="shadow_type">GTK_SHADOW_NONE</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                     <property name="pack_type">GTK_PACK_END</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <placeholder/>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</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">False</property>
+                     <property name="fill">False</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">&lt;</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">&gt;</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">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
              </child>
            </widget>
            <packing>
-             <property name="shrink">True</property>
+             <property name="shrink">False</property>
              <property name="resize">False</property>
            </packing>
          </child>


-------------------------------------------------------------------------
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

Reply via email to