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

Modified Files:
        ChangeLog_detailed gtkpod.glade 
Log Message:
         * src/ipod_init.[ch]...: renamed init_model_number_combo()
           and init_ipod() to gp_...()

         * src/file_itunesdb (gp_load_ipod): ask for model number of
           the iPod if none is available. If one is available from
           SysInfo file, store that information in the prefs system.

         * ipod_init.[ch]: new: gp_ipod_init_set_model() asking for a
           model number string and storing it.



Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- ChangeLog_detailed  10 Jun 2006 08:29:42 -0000      1.228
+++ ChangeLog_detailed  10 Jun 2006 10:38:56 -0000      1.229
@@ -1,16 +1,20 @@
-2006-06-10 James Liggett <[EMAIL PROTECTED]>
+2006-06-09 Jorg Schuler <[EMAIL PROTECTED]>
 
-       * src/prefs.h
-         src/prefs.c
-         src/prefs_window.c: Got rid of unused_gboolean3.
+        * src/ipod_init.[ch]...: renamed init_model_number_combo()
+           and init_ipod() to gp_...()
 
-2006-06-09 Jorg Schuler <[EMAIL PROTECTED]>
+        * src/file_itunesdb (gp_load_ipod): ask for model number of
+          the iPod if none is available. If one is available from
+          SysInfo file, store that information in the prefs system.
 
-        * src/display_sorttabs.c
-          (sp_update_date_interval_from_string): fix compilation
-          warning and possible segfault.
+        * ipod_init.[ch]: new: gp_ipod_init_set_model() asking for a
+           model number string and storing it.
 
-2006-06-09 James Liggett <[EMAIL PROTECTED]>
+2006-06-10 James Liggett <[EMAIL PROTECTED]>
+
+        * src/prefs.h
+          src/prefs.c
+          src/prefs_window.c: Got rid of unused_gboolean3.
 
         * src/prefs.c: Miscellaneous formatting fixes. I've now
           switched to using emacs, so I hope this won't be a problem
@@ -18,6 +22,12 @@
 
 2006-06-09 Jorg Schuler <[EMAIL PROTECTED]>
 
+        * src/display_sorttabs.c
+          (sp_update_date_interval_from_string): fix compilation
+          warning and possible segfault.
+
+2006-06-09 Jorg Schuler <[EMAIL PROTECTED]>
+
         * README: some hints from a recent gtkpod-questions thread.
 
 2006-06-08 James Liggett <[EMAIL PROTECTED]>

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- gtkpod.glade        8 Jun 2006 15:40:14 -0000       1.205
+++ gtkpod.glade        10 Jun 2006 10:38:56 -0000      1.206
@@ -18414,9 +18414,9 @@
          <child>
            <widget class="GtkLabel" id="ipod_init_label">
              <property name="visible">True</property>
-             <property name="label">label</property>
+             <property name="label" translatable="yes">&lt;b&gt;Please select 
mountpoint and your iPod model&lt;/b&gt;</property>
              <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
+             <property name="use_markup">True</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
@@ -18605,4 +18605,196 @@
   </child>
 </widget>
 
+<widget class="GtkDialog" id="set_ipod_model_dialog">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Initialize iPod</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</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-vbox2">
+      <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_area2">
+         <property name="visible">True</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+         <child>
+           <widget class="GtkButton" id="cancelbutton1">
+             <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">-6</property>
+           </widget>
+         </child>
+
+         <child>
+           <widget class="GtkButton" id="okbutton1">
+             <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">-5</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="vbox172">
+         <property name="border_width">5</property>
+         <property name="visible">True</property>
+         <property name="homogeneous">False</property>
+         <property name="spacing">0</property>
+
+         <child>
+           <widget class="GtkLabel" id="ipod_init_label">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">&lt;b&gt;Please select 
your iPod model&lt;/b&gt;</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">True</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">5</property>
+             <property name="expand">False</property>
+             <property name="fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkViewport" id="viewport22">
+             <property name="visible">True</property>
+             <property name="shadow_type">GTK_SHADOW_IN</property>
+
+             <child>
+               <widget class="GtkVBox" id="vbox173">
+                 <property name="border_width">6</property>
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">4</property>
+
+                 <child>
+                   <widget class="GtkTable" id="table48">
+                     <property name="visible">True</property>
+                     <property name="n_rows">2</property>
+                     <property name="n_columns">3</property>
+                     <property name="homogeneous">False</property>
+                     <property name="row_spacing">0</property>
+                     <property name="column_spacing">0</property>
+
+                     <child>
+                       <widget class="GtkLabel" id="label430">
+                         <property name="visible">True</property>
+                         <property name="label" 
translatable="yes">Model:</property>
+                         <property name="use_underline">False</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</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">10</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="left_attach">0</property>
+                         <property name="right_attach">1</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_options">fill</property>
+                         <property name="y_options">fill</property>
+                       </packing>
+                     </child>
+
+                     <child>
+                       <widget class="GtkComboBoxEntry" id="model_combo">
+                         <property name="width_request">250</property>
+                         <property name="visible">True</property>
+                         <property name="add_tearoffs">False</property>
+                         <property name="has_frame">True</property>
+                         <property name="focus_on_click">True</property>
+                       </widget>
+                       <packing>
+                         <property name="left_attach">1</property>
+                         <property name="right_attach">3</property>
+                         <property name="top_attach">1</property>
+                         <property name="bottom_attach">2</property>
+                         <property name="x_padding">3</property>
+                         <property name="y_padding">3</property>
+                         <property name="y_options">fill</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">6</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <placeholder/>
+                 </child>
+               </widget>
+             </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>
+  </child>
+</widget>
+
 </glade-interface>



_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to