Revision: 1670
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1670&view=rev
Author: phantom_sf
Date: 2007-08-05 15:41:27 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
2007-07-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
* src/display_photo.c: displays the photo albums listed on the ipod
* src/display_coverart.c: correction of minor merging duplication error
Modified Paths:
--------------
gtkpod/branches/photo_support_branch/data/gtkpod.glade
gtkpod/branches/photo_support_branch/src/display_coverart.c
gtkpod/branches/photo_support_branch/src/display_photo.c
Modified: gtkpod/branches/photo_support_branch/data/gtkpod.glade
===================================================================
--- gtkpod/branches/photo_support_branch/data/gtkpod.glade 2007-08-04
06:46:45 UTC (rev 1669)
+++ gtkpod/branches/photo_support_branch/data/gtkpod.glade 2007-08-05
22:41:27 UTC (rev 1670)
@@ -20582,7 +20582,14 @@
<property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <placeholder/>
+ <widget class="GtkViewport" id="photo_album_viewport">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
</child>
</widget>
<packing>
@@ -20625,7 +20632,7 @@
</child>
<child>
- <widget class="GtkScrolledWindow" id="photothumbnail_window">
+ <widget class="GtkScrolledWindow" id="photo_thumbnail_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
Modified: gtkpod/branches/photo_support_branch/src/display_coverart.c
===================================================================
--- gtkpod/branches/photo_support_branch/src/display_coverart.c 2007-08-04
06:46:45 UTC (rev 1669)
+++ gtkpod/branches/photo_support_branch/src/display_coverart.c 2007-08-05
22:41:27 UTC (rev 1670)
@@ -1592,15 +1592,6 @@
etd->tartwork_changed = FALSE;
set_covers(TRUE);
}
-
- ExtraTrackData *etd;
- etd = track->userdata;
- if (etd->tartwork_changed == TRUE)
- {
- etd->tartwork_changed = FALSE;
- set_covers(TRUE);
- }
-
return;
}
else
Modified: gtkpod/branches/photo_support_branch/src/display_photo.c
===================================================================
--- gtkpod/branches/photo_support_branch/src/display_photo.c 2007-08-04
06:46:45 UTC (rev 1669)
+++ gtkpod/branches/photo_support_branch/src/display_photo.c 2007-08-05
22:41:27 UTC (rev 1670)
@@ -36,7 +36,7 @@
/* Main viewport containing all of the photo related components */
static GtkWidget *photo_viewport = NULL;
/* Window displaying the list of albums */
-static GtkWidget *photo_album_window = NULL;
+static GtkWidget *photo_album_viewport = NULL;
/* Window displaying the thumbnails of the photos */
static GtkWidget *photo_thumb_window = NULL;
/* pointer to the treeview for the photo album display */
@@ -45,6 +45,12 @@
/* Declarations */
void gp_create_albumview (iTunesDB *itdb);
+enum
+{
+ COL_ALBUM_NAME = 0,
+ NUM_COLUMNS
+} ;
+
static void debug_list_photos (iTunesDB *itdb)
{
ExtraiTunesDBData *eitdb;
@@ -256,15 +262,15 @@
{
photo_xml = glade_xml_new (xml_file, "photo_panel",
NULL);
photowin = gtkpod_xml_get_widget (photo_xml,
"photo_panel");
- photo_album_window = gtkpod_xml_get_widget (photo_xml,
"photo_panel");
- photo_thumb_window = gtkpod_xml_get_widget (photo_xml,
"photo_panel");
+ photo_album_viewport = gtkpod_xml_get_widget
(photo_xml, "photo_album_viewport");
+ photo_thumb_window = gtkpod_xml_get_widget (photo_xml,
"photo_thumbnail_window");
photo_viewport = gtkpod_xml_get_widget (photo_xml,
"photo_viewport");
- g_object_ref (photo_album_window);
+ g_object_ref (photo_album_viewport);
g_object_ref (photo_thumb_window);
g_object_ref (photo_viewport);
gtk_container_remove (GTK_CONTAINER (photowin),
photo_viewport);
/* we don't need this any more */
- gtk_widget_destroy (photowin);
+ gtk_widget_destroy (photowin);
}
if ( gtk_widget_get_parent (photo_viewport) == NULL)
@@ -320,48 +326,44 @@
{
GtkListStore *model;
GtkTreeSelection *selection;
- GtkWidget *tree;
GtkTreeIter iter;
GtkCellRenderer *renderer;
- GtkTreeViewColumn *column;
ExtraiTunesDBData *eitdb;
PhotoDB *photodb;
GList *gl_album;
- /* destroy old listview */
- if (album_listview)
- {
- model = GTK_LIST_STORE (gtk_tree_view_get_model (album_listview));
- g_return_if_fail (model);
- g_object_unref (model);
- gtk_widget_destroy (GTK_WIDGET (album_listview));
- album_listview = NULL;
- }
- /* create new one */
-// gtk_widget_set_events (tree, GDK_KEY_RELEASE_MASK);
- tree = gtk_tree_view_new ();
- gtk_widget_show (tree);
- album_listview = GTK_TREE_VIEW (tree);
- gtk_container_add (GTK_CONTAINER (photo_album_window), tree);
-
- /* create model */
- model = gtk_list_store_new (1, G_TYPE_STRING);
-
- /* set tree model */
- gtk_tree_view_set_model (album_listview, GTK_TREE_MODEL (model));
- gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (album_listview), TRUE);
- gtk_tree_selection_set_mode (gtk_tree_view_get_selection (album_listview),
- GTK_SELECTION_SINGLE);
- selection = gtk_tree_view_get_selection (album_listview);
-// g_signal_connect (G_OBJECT (selection), "changed",
-// G_CALLBACK (pm_selection_changed), NULL);
-
eitdb = itdb->userdata;
photodb = eitdb->photodb;
g_return_if_fail (photodb);
+
+ /* destroy old listview */
+ if (album_listview)
+ {
+ model = GTK_LIST_STORE (gtk_tree_view_get_model
(album_listview));
+ g_return_if_fail (model);
+ g_object_unref (model);
+ gtk_widget_destroy (GTK_WIDGET (album_listview));
+ album_listview = NULL;
+ }
+
+ /* === Create New One === */
+ /* create tree view */
+ album_listview = GTK_TREE_VIEW (gtk_tree_view_new ());
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_insert_column_with_attributes (
+ album_listview,
+ -1,
+ _("Photo Albums"),
+ renderer,
+ "text", COL_ALBUM_NAME,
+ NULL);
+
+ /* create model */
+ model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING);
for (gl_album=photodb->photoalbums; gl_album; gl_album=gl_album->next)
- {
+ {
PhotoAlbum *album = gl_album->data;
g_return_if_fail (album);
@@ -370,20 +372,28 @@
/* Add a new row to the model */
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter,
-
0, name,
- -1);
+
COL_ALBUM_NAME, name,
+ -1);
}
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Photo Albums"),
-
renderer,
-
"text", 0,
-
NULL);
-
-// gtk_tree_view_column_set_title (column, _("Photo Albums"));
- gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column);
-// gtk_tree_view_column_pack_start (column, renderer, FALSE);
+ /* set tree model */
+ gtk_tree_view_set_model (album_listview, GTK_TREE_MODEL (model));
+ gtk_tree_view_set_rules_hint (album_listview, TRUE);
+
+ gtk_tree_selection_set_mode (
+ gtk_tree_view_get_selection (album_listview),
+ GTK_SELECTION_SINGLE);
+
+ gtk_container_add (GTK_CONTAINER (photo_album_viewport),
GTK_WIDGET(album_listview));
+ gtk_widget_show_all (photo_album_viewport);
+
+// gtk_widget_set_events (tree, GDK_KEY_RELEASE_MASK);
+//
+// selection = gtk_tree_view_get_selection (album_listview);
+// g_signal_connect (G_OBJECT (selection), "changed",
+// G_CALLBACK (pm_selection_changed), NULL);
+//
// gtk_drag_source_set (GTK_WIDGET (playlist_treeview),
// GDK_BUTTON1_MASK,
// pm_drag_types, TGNR (pm_drag_types),
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
