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

Modified Files:
        ChangeLog_detailed gtkpod.glade 
Log Message:
         * src/repository.c: use GtkComboEntry to select iPod model
           just like in ipod_init.c



Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- ChangeLog_detailed  8 Jun 2006 06:10:46 -0000       1.217
+++ ChangeLog_detailed  8 Jun 2006 15:40:13 -0000       1.218
@@ -9,6 +9,9 @@
           - reset model number if iPod with different number is loaded
           - write model number to iPod if iPod without model number
             is loaded.
+
+        * src/repository.c: use GtkComboEntry to select iPod model
+          just like in ipod_init.c
                         
 2006-06-07 James Liggett <[EMAIL PROTECTED]>
         
@@ -28,6 +31,10 @@
                 
 2006-06-06 James Liggett <[EMAIL PROTECTED]>
 
+        * src/repository.c: use ComboBoxEntry to allow the selection
+           of the iPod model in the same way as in the ipod_init
+           dialog.
+
         * src/display.c
           src/display_songs.c
           src/display_sorttabs.c

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -d -r1.204 -r1.205
--- gtkpod.glade        6 Jun 2006 00:47:05 -0000       1.204
+++ gtkpod.glade        8 Jun 2006 15:40:14 -0000       1.205
@@ -16861,30 +16861,6 @@
                                              </child>
 
                                              <child>
-                                               <widget class="GtkEntry" 
id="ipod_model_entry">
-                                                 <property 
name="visible">True</property>
-                                                 <property name="tooltip" 
translatable="yes">Set this to the model number of your iPod (e.g. 
&quot;A003&quot;) in case it is not automatically detected and you want to use 
cover art.</property>
-                                                 <property 
name="can_focus">True</property>
-                                                 <property 
name="editable">True</property>
-                                                 <property 
name="visibility">True</property>
-                                                 <property 
name="max_length">0</property>
-                                                 <property name="text" 
translatable="yes"></property>
-                                                 <property 
name="has_frame">True</property>
-                                                 <property 
name="invisible_char">*</property>
-                                                 <property 
name="activates_default">False</property>
-                                               </widget>
-                                               <packing>
-                                                 <property 
name="left_attach">1</property>
-                                                 <property 
name="right_attach">2</property>
-                                                 <property 
name="top_attach">2</property>
-                                                 <property 
name="bottom_attach">3</property>
-                                                 <property 
name="x_padding">3</property>
-                                                 <property 
name="y_padding">3</property>
-                                                 <property 
name="y_options"></property>
-                                               </packing>
-                                             </child>
-
-                                             <child>
                                                <widget class="GtkEntry" 
id="local_path_entry">
                                                  <property 
name="visible">True</property>
                                                  <property name="tooltip" 
translatable="yes">Specify exact path including command line options. '%i' will 
be replaced with the mount point of the iPod.</property>
@@ -17079,6 +17055,25 @@
                                                  <property 
name="y_options"></property>
                                                </packing>
                                              </child>
+
+                                             <child>
+                                               <widget 
class="GtkComboBoxEntry" id="ipod_model_combo">
+                                                 <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">2</property>
+                                                 <property 
name="top_attach">2</property>
+                                                 <property 
name="bottom_attach">3</property>
+                                                 <property 
name="x_padding">3</property>
+                                                 <property 
name="y_padding">3</property>
+                                                 <property 
name="x_options">fill</property>
+                                                 <property 
name="y_options">fill</property>
+                                               </packing>
+                                             </child>
                                            </widget>
                                            <packing>
                                              <property 
name="padding">6</property>
@@ -18018,30 +18013,6 @@
          </child>
 
          <child>
-           <widget class="GtkEntry" id="ipod_model_entry">
-             <property name="visible">True</property>
-             <property name="tooltip" translatable="yes">Set this to the model 
number of your iPod (e.g. &quot;MA003&quot;) in case it is not automatically 
detected and you want to use cover art.</property>
-             <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">True</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">4</property>
-             <property name="bottom_attach">5</property>
-             <property name="x_padding">3</property>
-             <property name="y_padding">3</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
-
-         <child>
            <widget class="GtkEntry" id="backup_entry">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
@@ -18285,6 +18256,25 @@
              <property name="y_options"></property>
            </packing>
          </child>
+
+         <child>
+           <widget class="GtkComboBoxEntry" id="ipod_model_combo">
+             <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">2</property>
+             <property name="top_attach">4</property>
+             <property name="bottom_attach">5</property>
+             <property name="x_padding">3</property>
+             <property name="y_padding">3</property>
+             <property name="x_options">fill</property>
+             <property name="y_options">fill</property>
+           </packing>
+         </child>
        </widget>
        <packing>
          <property name="padding">0</property>



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

Reply via email to