Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv5474/src
Modified Files:
file_itunesdb.c ipod_init.c itdb.h
Log Message:
* src/ipod_init.c: pretty much finished ipod_init dialog.
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- file_itunesdb.c 4 Jun 2006 16:27:33 -0000 1.89
+++ file_itunesdb.c 6 Jun 2006 00:47:06 -0000 1.90
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-04 23:35:21 jcs>
+/* Time-stamp: <2006-06-06 00:42:56 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -830,7 +830,7 @@
ExtraiTunesDBData *eitdb;
iTunesDB *new_itdb = NULL;
gchar *mountpoint;
- gchar *itunes_control;
+ gchar *itunesdb;
gboolean load = TRUE;
g_return_val_if_fail (itdb, NULL);
@@ -844,8 +844,8 @@
itdb_device_set_mountpoint (itdb->device, mountpoint);
- itunes_control = itdb_get_control_dir (mountpoint);
- if (!itunes_control)
+ itunesdb = itdb_get_itunesdb_path (mountpoint);
+ if (!itunesdb)
{
gchar *str = g_strdup_printf (_("Could not find iPod directory
structure at '%s'. If you are sure that the iPod is properly mounted, gtkpod
can create the directory structure for you.\n\nDo you want to create the
directory structure now?\n"), mountpoint);
GtkWidget *dialog = gtk_message_dialog_new (
@@ -867,7 +867,7 @@
load = FALSE;
}
}
- g_free (itunes_control);
+ g_free (itunesdb);
g_free (mountpoint);
if (load)
Index: ipod_init.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/ipod_init.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ipod_init.c 4 Jun 2006 16:27:33 -0000 1.1
+++ ipod_init.c 6 Jun 2006 00:47:06 -0000 1.2
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-05 01:19:33 jcs>
+/* Time-stamp: <2006-06-06 01:09:34 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -44,15 +44,27 @@
typedef struct _IpodInit IpodInit;
+/* Strings used several times */
+const gchar *SELECT_OR_ENTER_YOUR_MODEL=N_("Select or enter your model");
+
/* string constants for window widgets used more than once */
static const gchar *MOUNTPOINT_ENTRY="mountpoint_entry";
static const gchar *MOUNTPOINT_BUTTON="mountpoint_button";
+static const gchar *MODEL_COMBO="model_combo";
+
+/* Columns for the model_combo tree model */
+enum
+{
+ COL_POINTER,
+ COL_STRING
+};
+
/* shortcut to reference widgets when repwin->xml is already set */
#define GET_WIDGET(a) gtkpod_xml_get_widget (ii->xml,a)
-
-/* mountpoint browse button was clicked */
+/* mountpoint browse button was clicked -> open a directory browser
+ * and copy the result into the mountpoint entry. */
static void mountpoint_button_clicked (GtkButton *button, IpodInit *ii)
{
const gchar *old_dir;
@@ -77,19 +89,160 @@
}
+static void
+set_cell (GtkCellLayout *cell_layout,
+ GtkCellRenderer *cell,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
+{
+ gboolean header;
+ gchar *text;
+ IpodInfo *info;
+
+ gtk_tree_model_get (tree_model, iter, COL_POINTER, &info, -1);
+ g_return_if_fail (info);
+
+ header = gtk_tree_model_iter_has_child (tree_model, iter);
+
+ if (header)
+ {
+ text = g_strdup (
+ itdb_info_get_ipod_generation_string (info->ipod_generation));
+ }
+ else
+ {
+ if (info->capacity > 0)
+ {
+ text = g_strdup_printf ("%2.0fGB %s (x%s)",
+ info->capacity,
+ itdb_info_get_ipod_model_name_string (
+ info->ipod_model),
+ info->model_number);
+ }
+ else
+ { /* no capacity information available */
+ text = g_strdup_printf ("%s (x%s)",
+ itdb_info_get_ipod_model_name_string (
+ info->ipod_model),
+ info->model_number);
+ }
+ }
+
+ g_object_set (cell,
+ "sensitive", !header,
+ "text", text,
+ NULL);
+
+ g_free (text);
+}
+
+
+void init_model_combo (IpodInit *ii)
+{
+ const IpodInfo *table;
+ Itdb_IpodGeneration generation;
+ GtkCellRenderer *renderer;
+ GtkTreeStore *store;
+ gboolean info_found;
+ GtkComboBox *cb;
+ const IpodInfo *info;
+ const gint BUFLEN = 50;
+ gchar buf[BUFLEN];
+ GtkEntry *entry;
+
+ g_return_if_fail (ii && ii->itdb);
+
+ table = itdb_info_get_ipod_info_table ();
+ g_return_if_fail (table);
+
+ /* We need the G_TYPE_STRING column because GtkComboBoxEntry
+ requires it */
+ store = gtk_tree_store_new (2, G_TYPE_POINTER, G_TYPE_STRING);
+
+
+ /* Create a tree model with the model numbers listed as a branch
+ under each generation */
+ generation = ITDB_IPOD_GENERATION_FIRST;
+ do
+ {
+ GtkTreeIter iter;
+ info = table;
+ info_found = FALSE;
+ while (info->model_number)
+ {
+ if (info->ipod_generation == generation)
+ {
+ GtkTreeIter iter_child;
+ if (!info_found)
+ {
+ gtk_tree_store_append (store, &iter, NULL);
+ gtk_tree_store_set (store, &iter,
+ COL_POINTER, info,
+ COL_STRING, "",
+ -1);
+ info_found = TRUE;
+ }
+ gtk_tree_store_append (store, &iter_child, &iter);
+ /* gtk_tree_store_set() is intelligent enough to copy
+ strings we pass to it */
+ g_snprintf (buf, BUFLEN, "x%s", info->model_number);
+ gtk_tree_store_set (store, &iter_child,
+ COL_POINTER, info,
+ COL_STRING, buf,
+ -1);
+ }
+ ++info;
+ }
+ ++generation;
+ } while (info_found);
+
+ /* set the model, specify the text column, and clear the cell
+ layout (glade seems to automatically add a text column which
+ messes up the entire layout) */
+ cb = GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO));
+ gtk_combo_box_set_model (cb, GTK_TREE_MODEL (store));
+ g_object_unref (store);
+ gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (cb),
+ COL_STRING);
+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (cb));
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cb), renderer, FALSE);
+ gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (cb),
+ renderer,
+ set_cell,
+ NULL, NULL);
+
+ /* If available set current model, otherwise indicate that */
+ info = itdb_device_get_ipod_info (ii->itdb->device);
+ if (info && (info->ipod_generation != ITDB_IPOD_GENERATION_UNKNOWN))
+ {
+ g_snprintf (buf, BUFLEN, "x%s", info->model_number);
+ }
+ else
+ {
+ g_snprintf (buf, BUFLEN, "%s", gettext (SELECT_OR_ENTER_YOUR_MODEL));
+ }
+ entry = GTK_ENTRY (gtk_bin_get_child(GTK_BIN (cb)));
+ gtk_entry_set_text (entry, buf);
+}
+
+
gboolean ipod_init (iTunesDB *itdb)
{
IpodInit *ii;
gint response;
gboolean result = FALSE;
- gchar *mountpoint, *new_mount, *name;
+ gchar *mountpoint, *new_mount, *name, *model;
GError *error = NULL;
g_return_val_if_fail (itdb, FALSE);
/* Create window */
ii = g_new0 (IpodInit, 1);
+ ii->itdb = itdb;
ii->xml = glade_xml_new (xml_file, "ipod_init_dialog", NULL);
ii->window = gtkpod_xml_get_widget (ii->xml,
"ipod_init_dialog");
@@ -107,6 +260,9 @@
g_signal_connect (GET_WIDGET (MOUNTPOINT_BUTTON), "clicked",
G_CALLBACK (mountpoint_button_clicked), ii);
+ /* Setup model combo */
+ init_model_combo (ii);
+
response = gtk_dialog_run (GTK_DIALOG (ii->window));
switch (response)
@@ -145,8 +301,15 @@
g_free (new_mount);
new_mount = NULL;
}
+ model = gtk_combo_box_get_active_text (
+ GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO)));
+ if (strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0)
+ { /* User didn't choose a model */
+ model[0] = 0;
+ }
+
name = get_itdb_prefs_string (itdb, "name");
- result = itdb_init_ipod (mountpoint, "PA005", name, &error);
+ result = itdb_init_ipod (mountpoint, model, name, &error);
if (!result)
{
if (error)
@@ -162,6 +325,7 @@
}
}
g_free (name);
+ g_free (model);
break;
default:
/* canceled -- do nothing */
Index: itdb.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/itdb.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- itdb.h 28 Nov 2005 16:25:34 -0000 1.18
+++ itdb.h 6 Jun 2006 00:47:07 -0000 1.19
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-27 15:52:33 jcs>
+/* Time-stamp: <2006-06-05 21:34:12 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -47,4 +47,5 @@
typedef Itdb_Track Track;
typedef Itdb_Thumb Thumb;
typedef Itdb_Artwork Artwork;
+typedef Itdb_IpodInfo IpodInfo;
#endif
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
