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

Modified Files:
        ChangeLog_detailed gtkpod.glade 
Log Message:
        * merged fetchcover_development_branch back to HEAD



Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -d -r1.411 -r1.412
--- ChangeLog_detailed  15 Apr 2007 11:31:38 -0000      1.411
+++ ChangeLog_detailed  15 Apr 2007 13:27:40 -0000      1.412
@@ -1,10 +1,47 @@
 2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
+       * merged fetchcover_development_branch back to HEAD
+
        * src/prefs.[ch]: fixed typos ("prefrences") -- thanks to
           Daniele Forsi.
          Changed mkdir() to g_mkdir() and reduced number of #include
           headers.
 
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * (fetchcover branch) src/fetchcover.c: add NULL pointer at
+         the end of some variable argument calls to avoid segfaults.
+
+2007-04-14 P.G. Richardson <phantom_sf at users.sourceforge.net>
+(fetchcover branch)
+ - Context menu on display artwork updated with new items:
+   -- Selection of cover from a file
+   -- Download of cover from the web
+ - Fetch Cover button moved up in Edit Details window
+ - Display Coverart slider values sorted out so as to better reflect index
+   of covers
+ - Display Coverart up/down arrows are shown/hidden depending on window start
+ - Fetchcover dialog bordered to clarify a blank image is displayed
+ - Fetchcover dialog added to glade-2 xml file
+ - Hightlighting toned down for main image in Display Coverart window
+ 
+2007-04-01 P.G. Richardson <phantom_sf at users.sourceforge.net>
+(fetchcover branch)
+gtkpod.glade:
+       * rename Fetch Cover button
+
+context_menus.c:
+       * create context menu for main coverart display image
+       * new context action hooks to display artwork in a dialog
+
+display_coverart.c:
+       * coverart_display_big_artwork() for displaying a dialog containing an 
originally sized coverart image
+       * coverart_get_displayed_tracks() for returning all tracks relating to 
the main coverart display image
+
+fetchcover.c
+       * completed functionality, including next, previous, cancel and save 
buttons
+       * status bar to indicate whether images have been recovered
+
 2007-04-10 Todd Zullinger <tmzullinger at users.sourceforge.net>
 
        * scripts/convert-ogg2mp3.sh: Try to use id3v2 as a fallback

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- gtkpod.glade        7 Apr 2007 04:43:14 -0000       1.230
+++ gtkpod.glade        15 Apr 2007 13:27:40 -0000      1.231
@@ -14576,6 +14576,7 @@
 </widget>
 
 <widget class="GtkWindow" id="details_window">
+  <property name="visible">True</property>
   <property name="title" translatable="yes">Details</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
@@ -14682,7 +14683,7 @@
                      </child>
                    </widget>
                    <packing>
-                     <property name="padding">0</property>
+                     <property name="padding">6</property>
                      <property name="expand">False</property>
                      <property name="fill">True</property>
                    </packing>
@@ -14733,7 +14734,7 @@
                              <child>
                                <widget class="GtkLabel" id="label341">
                                  <property name="visible">True</property>
-                                 <property name="label" translatable="yes">Set 
Cover Art</property>
+                                 <property name="label" translatable="yes">Set 
Cover Art from File</property>
                                  <property name="use_underline">True</property>
                                  <property name="use_markup">False</property>
                                  <property 
name="justify">GTK_JUSTIFY_LEFT</property>
@@ -14760,7 +14761,7 @@
                      </child>
                    </widget>
                    <packing>
-                     <property name="padding">6</property>
+                     <property name="padding">0</property>
                      <property name="expand">False</property>
                      <property name="fill">False</property>
                    </packing>
@@ -14864,6 +14865,84 @@
                  </child>
 
                  <child>
+                   <widget class="GtkButton" id="details_button_fetch_cover">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                     <property name="focus_on_click">True</property>
+
+                     <child>
+                       <widget class="GtkAlignment" id="alignment14">
+                         <property name="visible">True</property>
+                         <property name="xalign">0</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xscale">0</property>
+                         <property name="yscale">0</property>
+                         <property name="top_padding">0</property>
+                         <property name="bottom_padding">0</property>
+                         <property name="left_padding">0</property>
+                         <property name="right_padding">0</property>
+
+                         <child>
+                           <widget class="GtkHBox" id="hbox206">
+                             <property name="visible">True</property>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">2</property>
+
+                             <child>
+                               <widget class="GtkImage" id="image3859">
+                                 <property name="visible">True</property>
+                                 <property name="stock">gtk-network</property>
+                                 <property name="icon_size">4</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkLabel" id="label444">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">Set 
Cover Art from Web</property>
+                                 <property name="use_underline">True</property>
+                                 <property name="use_markup">False</property>
+                                 <property 
name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property 
name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property 
name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+                           </widget>
+                         </child>
+                       </widget>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">6</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
                    <widget class="GtkButton" 
id="details_button_remove_artwork">
                      <property name="visible">True</property>
                      <property name="can_focus">True</property>
@@ -20548,4 +20627,158 @@
   </child>
 </widget>
 
+<widget class="GtkDialog" id="fetchcover_dialog">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Download Cover</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">True</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox3">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog-action_area3">
+         <property name="visible">True</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+         <child>
+           <widget class="GtkButton" id="cancelbutton2">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-cancel</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-2</property>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="okbutton2">
+             <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="can_focus">True</property>
+             <property name="label">gtk-ok</property>
+             <property name="use_stock">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-3</property>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkVBox" id="panelbox">
+         <property name="border_width">10</property>
+         <property name="visible">True</property>
+         <property name="homogeneous">False</property>
+         <property name="spacing">5</property>
+
+         <child>
+           <widget class="GtkHBox" id="canvasbutton_hbox">
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">5</property>
+
+             <child>
+               <placeholder/>
+             </child>
+
+             <child>
+               <widget class="GtkVBox" id="buttonbox">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">5</property>
+
+                 <child>
+                   <widget class="GtkButton" id="next_button">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" translatable="yes">_Find 
New</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="GtkButton" id="prev_button">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="label" 
translatable="yes">Previous</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>
+                 <property name="pack_type">GTK_PACK_END</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="padding">0</property>
+             <property name="expand">True</property>
+             <property name="fill">True</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkStatusbar" id="fetchcover_statusbar">
+             <property name="visible">True</property>
+             <property name="has_resize_grip">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>
+  </child>
+</widget>
+
 </glade-interface>


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to